aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-19 18:09:04 +08:00
parent 84ad5a609e
commit 74aa30c2eb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

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