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-07-11 16:50:38 +08:00
parent 3eb7449584
commit eb64a352d2
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,13 +694,13 @@ 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) ) {
scanResultItem.setResult("fail"); // scanResultItem.setResult("fail");
scanResultItem.setMessage("缅甸只允许主单"); // scanResultItem.setMessage("缅甸只允许主单");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); // scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem); // itemList.add(scanResultItem);
return itemList; // return itemList;
} // }
}else{ }else{
if ( mainBillCode.equals(scanBillCode) ) { if ( mainBillCode.equals(scanBillCode) ) {
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
@ -893,6 +893,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
boolean blUnPack=false; boolean blUnPack=false;
Map countryMap = new HashMap(); Map countryMap = new HashMap();
String destCountry=null;
// 子单号处理 // 子单号处理
for (String scanBillCode : billCodeArr) { for (String scanBillCode : billCodeArr) {
// 返回原始数据返回 // 返回原始数据返回
@ -995,6 +997,19 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
} }
} }
if(destCountry==null){
destCountry=emisWaybill.getReceiveCountry();
}
else{
// 不允许有不同国家的货混装
if( !destCountry.equals(emisWaybill.getReceiveCountry()) ){
scanResultItem.setResult("fail");
scanResultItem.setMessage("不同国家的货不允许混装");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem);
return itemList;
}
}
// 记录总票数 // 记录总票数
if(!mainBillMap.containsKey(mainBillCode)){ if(!mainBillMap.containsKey(mainBillCode)){