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-20 12:50:43 +08:00
parent f2f7a488d4
commit 848656c645
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,6 +363,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode); EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
// 返货虚拟面单、出口虚拟面单；不允许做 派件扫描和签收扫描
if("1".equals(emisWaybill.getBlIsQuestion()) && (scanType.equals(ScanType.SENT.opCode) || scanType.equals(ScanType.SIGNED.opCode) )){
if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){
scanResultItem.setResult("fail");
scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode);
itemList.add(scanResultItem);
return itemList;
}
}
// 返回数据 // 返回数据
scanResultItem.getData().put("billWeight", emisWaybill.getBillWeight()); scanResultItem.getData().put("billWeight", emisWaybill.getBillWeight());
scanResultItem.getData().put("totalVolume", emisWaybill.getTotalVolume()); scanResultItem.getData().put("totalVolume", emisWaybill.getTotalVolume());
@ -572,6 +583,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 获取订单数据 // 获取订单数据
EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode); EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
// 返货虚拟面单、出口虚拟面单；不允许做 派件扫描和签收扫描
if("1".equals(emisWaybill.getBlIsQuestion()) && (scanType.equals(ScanType.SENT.opCode) || scanType.equals(ScanType.SIGNED.opCode) )){
if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){
scanResultItem.setResult("fail");
scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode);
itemList.add(scanResultItem);
return itemList;
}
}
// 填充运单基础数据 // 填充运单基础数据
emisTmsScanRecord.setMainBillCode(emisWaybill.getBillCode()); emisTmsScanRecord.setMainBillCode(emisWaybill.getBillCode());
emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn()); emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());