md

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java

@@ -196,7 +196,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     public int checkWaybillIsSign(@Param("billCode")String billCode);
 
     // 判断是否已经接单
-    public int checkWaybillIsConfirm(@Param("billCode")String billCode);
+    public int checkWaybillIsGot(@Param("billCode")String billCode);
 
 
 

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;
+     }
+
 
 
 

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) {

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -270,8 +270,8 @@
     </select>
 
     <!--  检查运单号是否已接单 -->
-    <select id="checkWaybillIsConfirm" parameterType="String" resultType="int">
+    <select id="checkWaybillIsGot" parameterType="String" resultType="int">
-        select count(1) as cnt from emis_waybill where bill_code=#{billCode} and bl_sign='1' limit 1
+        select count(1) as cnt from emis_waybill where bill_code=#{billCode} and order_status='1' limit 1
     </select>