md

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

@@ -88,6 +88,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public int insertEmisWaybill(EmisWaybill emisWaybill);
 
+
     /**
      * 修改
      * 

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -1407,6 +1407,30 @@ public class EmisBaseService {
             return emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
      }
 
+     /**
+      * 检查是否可扫描
+      * @param billCode
+      * @return
+      */
+     public boolean checkCanScan(String billCode){
+         if(StringUtils.isEmpty(billCode)){
+             return false;
+         }
+
+         EmisWaybill waybill=getWaybillByBillCode(billCode);
+         if(waybill==null){
+             return false;
+         }
+
+         // 未接单不允许扫描
+         if(!"1".equals(waybill.getOrderStatus())){
+             return false;
+         }
+
+
+         return true;
+     }
+
 
      /**
       * 根据batchNo获取单号信息

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

@@ -494,6 +494,20 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //        }
 //        String billCodeArr[] = (String[]) billCodeSet.toArray();
 
+        // 未揽收不允许做扫描操作
+        for(int i = 0 ; i < billCodeArr.length ; i++){
+            String checkBillCode=billCodeArr[i];
+            if(!checkCanScan(checkBillCode)){
+                ScanResultItem scanResultItem = new ScanResultItem();
+                scanResultItem.setBillCode(checkBillCode);
+                scanResultItem.setResult("fail");
+                scanResultItem.setMessage("未揽收不允许扫描");
+                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_PARAM_ERROR.errorCode);
+                itemList.add(scanResultItem);
+                return itemList;
+            }
+        }
+
         Date scanDate = null;
         if(scanDateStr.contains("Z")){
             scanDateStr=scanDateStr.replace("T"," ");

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

@@ -2258,6 +2258,7 @@
     </select>
 
 
+
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         where a.id = #{id}