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 06:39:50 +08:00
parent 5da97b20a2
commit 6283032d3c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,12 +285,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
{ {
// 货物不在当前网点不允许扫描 // 货物不在当前网点不允许扫描
if(!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())){ if(
!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite())
&& !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getSendStiteCode())
&& !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())
){
ScanResultItem scanResultItem = new ScanResultItem(); ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode); scanResultItem.setBillCode(scanBillCode);
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
scanResultItem.setMessage("合包不在当前网点"); scanResultItem.setMessage("合包不在发出网点或目的网点，不允许操作");
itemList.add(scanResultItem); itemList.add(scanResultItem);
return itemList; return itemList;
} }
@ -1123,13 +1128,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode); EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
// 货物不在当前网点不允许扫描 // 货物不在当前网点不允许扫描
if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){ // if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
scanResultItem.setResult("fail"); // scanResultItem.setResult("fail");
scanResultItem.setMessage("运单不在当前网点"); // scanResultItem.setMessage("运单不在当前网点");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode); // scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
itemList.add(scanResultItem); // itemList.add(scanResultItem);
return itemList; // return itemList;
} // }
// 生成扫描记录 // 生成扫描记录
EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord(); EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
@ -1165,7 +1170,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
scanResultItem.setErrorCode(EmisBizErrorType.SUCCESS.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SUCCESS.errorCode);
scanResultItem.setMessage("操作成功"); scanResultItem.setMessage("操作成功");
itemList.add(scanResultItem); itemList.add(scanResultItem);
} }
// 更新合包信息 // 更新合包信息