diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index cb490adb2..f852599ad 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -196,7 +196,7 @@ public interface EmisWaybillMapper extends BaseMapper public int checkWaybillIsSign(@Param("billCode")String billCode); // 判断是否已经接单 - public int checkWaybillIsConfirm(@Param("billCode")String billCode); + public int checkWaybillIsGot(@Param("billCode")String billCode); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index bbef3cfc6..f81605d46 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -3009,6 +3009,10 @@ public class EmisBaseService { } + public boolean checkWaybillIsGot(String billCode){ + return emisWaybillMapper.checkWaybillIsGot(billCode)==1; + } + 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 e02ac6c5a..1b0842167 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 @@ -620,6 +620,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); @@ -751,6 +759,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { @@ -905,6 +923,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); + + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { @@ -1012,6 +1041,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); + + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { @@ -1231,6 +1271,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = emisTmsPackDtl.getMainBillCode(); + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { @@ -1362,6 +1412,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = emisTmsPackDtl.getMainBillCode(); + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { @@ -1796,6 +1856,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); + + // bug:1454,未开单不允许扫描 + boolean isGot = checkWaybillIsGot(mainBillCode); + if (isGot) { + scanResultItem.setResult("fail"); + scanResultItem.setMessage("运单未揽收"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); if (isSign) { diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 06992071a..9ccc50f5c 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -270,8 +270,8 @@ - + select count(1) as cnt from emis_waybill where bill_code=#{billCode} and order_status='1' limit 1