diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index e0e638544..0c1244dfa 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -174,6 +174,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 开始检查数据 String[] billCodeArr = billCodeInStr.split(","); + Date scanDate = DateUtils.parseDate(scanDateStr); + // 合包和拆包需单独处理 if(ScanType.CO_PACKING.opCode.equals(scanType)){ @@ -524,12 +526,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 如果是缅甸允许主单扫描,其他都不允许 if("0095".equals(emisWaybill.getReceiveCountry()) ){ // 缅甸只允许主单 - if (!mainBillCode.equals(scanBillCode))) { + if (!mainBillCode.equals(scanBillCode)) { throw new EmisBizError(EmisBizErrorType.EXISTS, "缅甸只允许主单"); } }else{ - if (mainBillCode.equals(scanBillCode))) { - throw new EmisBizError(EmisBizErrorType.EXISTS, "主单不能组包"); + if (mainBillCode.equals(scanBillCode)) { + throw new EmisBizError(EmisBizErrorType.EXISTS, "非缅甸只允许子单组包"); } }