diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index f9e6353b6..ad08fa158 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -363,6 +363,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm 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("totalVolume", emisWaybill.getTotalVolume()); @@ -572,6 +583,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取订单数据 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.setOrderSn(emisWaybill.getOrderSn());