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-30 17:13:21 +08:00
parent 395e4ebdde
commit feb73feec3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,13 +968,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
// 货物不在当前网点不允许扫描
if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
scanResultItem.setResult("fail");
scanResultItem.setMessage("运单不在当前网点");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
itemList.add(scanResultItem);
return itemList;
}
// if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("运单不在当前网点");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
// 如果是缅甸允许主单扫描,主单和子单只能二选一
if( "0095".equals(emisWaybill.getReceiveCountry()) ){