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 05:22:07 +08:00
parent 436bfabf91
commit fa5897f795
1 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,14 +244,78 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
continue;
}
// 到件扫描/报关扫描/清关扫描/发件扫描 - 需要支持扫描 合包条码
if(
scanType.equals(ScanType.ARRIVAL.opCode)
|| scanType.equals(ScanType.DEPARTURE.opCode)
|| scanType.equals(ScanType.CLEARANCE.opCode)
|| scanType.equals(ScanType.DECLEARE.opCode) ){
if(scanBillCode.startsWith("H")){
// 判断是否是合包号
EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode);
if(emisTmsPack!=null) {
if(emisTmsPack.getPackStatus().equals("2")){
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode);
scanResultItem.setResult("fail");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
scanResultItem.setMessage("已拆包，不允许扫描");
itemList.add(scanResultItem);
return itemList;
}
if(!emisTmsPack.getPackStatus().equals("1")){
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode);
scanResultItem.setResult("fail");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
scanResultItem.setMessage("未合包，不允许扫描");
itemList.add(scanResultItem);
return itemList;
}
// 合包发件扫描
if( scanType.equals(ScanType.DEPARTURE.opCode)
|| scanType.equals(ScanType.CLEARANCE.opCode)
|| scanType.equals(ScanType.DECLEARE.opCode)
)
{
// 货物不在当前网点不允许扫描
if(!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())){
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode);
scanResultItem.setResult("fail");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
scanResultItem.setMessage("合包不在当前网点");
itemList.add(scanResultItem);
return itemList;
}
}
// 原始数据返回
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode);
scanResultItem.getData().putAll(scanDataItem);
scanResultItem.setErrorCode(EmisBizErrorType.SUCCESS.errorCode);
scanResultItem.setResult("success");
scanResultItem.setMessage("允许操作");
itemList.add(scanResultItem);
return itemList;
}
}
}
// 原始数据返回
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(scanBillCode);
scanResultItem.getData().putAll(scanDataItem);
// 判断是否是合包
// 获取主单号
String mainBillCode = getMainBillCode(scanBillCode);