Merge remote-tracking branch 'origin/dev' into dev

dev
黄泽腾 2 years ago
commit 4fd3c726f0

@ -1,6 +1,7 @@
package com.glxp.api.controller.sync; package com.glxp.api.controller.sync;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
@ -65,12 +66,19 @@ public class SyncDataSetController {
syncDataSetEntity.setUpdateTime(new Date()); syncDataSetEntity.setUpdateTime(new Date());
syncDataSetEntity.setId(1); syncDataSetEntity.setId(1);
List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes(); List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes();
//重新生成id防止插入时单据类型被覆盖
for (SyncDataBustypeEntity s:busTypes) {
s.setId(IdUtil.getSnowflakeNextId());
}
syncDataBustypeService.deleteAll(1); syncDataBustypeService.deleteAll(1);
if (CollUtil.isNotEmpty(busTypes)) { if (CollUtil.isNotEmpty(busTypes)) {
syncDataBustypeService.inserts(busTypes); syncDataBustypeService.inserts(busTypes);
} }
List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes(); List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes();
for (SyncDataBustypeEntity s : toInBusTypes) {
s.setId(IdUtil.getSnowflakeNextId());
}
syncDataBustypeService.deleteAll(2); syncDataBustypeService.deleteAll(2);
if (CollUtil.isNotEmpty(toInBusTypes)) { if (CollUtil.isNotEmpty(toInBusTypes)) {
syncDataBustypeService.inserts(toInBusTypes); syncDataBustypeService.inserts(toInBusTypes);

@ -1,5 +1,7 @@
package com.glxp.api.entity.basic; package com.glxp.api.entity.basic;
import cn.hutool.core.util.StrUtil;
/** /**
* @author * @author
* @date 2020/9/22. * @date 2020/9/22.

@ -901,7 +901,7 @@ public class IoOrderServiceImpl implements IoOrderService {
ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction()); ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction());
if (thrOrderUploadBustypesEntity == null) { if (thrOrderUploadBustypesEntity == null) {
log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
return ResultVOUtils.error(500, billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); continue;
} }
if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) { if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) {
log.error(billNo + ":" + "单据来源不允许自动提交"); log.error(billNo + ":" + "单据来源不允许自动提交");

@ -117,9 +117,13 @@ public class FilterUdiUtils {
batchNo = spilts[4]; batchNo = spilts[4];
if (spilts.length > 6) { if (spilts.length > 6) {
serialNo = spilts[5]; serialNo = spilts[5];
if (serialNo != null && serialNo.equals("")) {
serialNo = null;
} }
if (StrUtil.isEmpty(batchNo)) {
batchNo = null;
}
if (StrUtil.isEmpty(serialNo)) {
serialNo = null;
} }
} }

@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
hikari: hikari:

Loading…
Cancel
Save