修改进厂扫描

src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -170,6 +170,22 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             return i;
         }
 
+        //调用计时作业方法
+        if (orderType==21){
+            //通过运输订单号查找订单id
+            BigDecimal orderId = utilsMapper.getOrderIdByOrderNumber(orderNumber);
+            //首先判断是否还有计时开始
+            BigDecimal startTime = utilsMapper.getTime(orderId);
+            //如果计时已经开始
+            if (startTime==null){
+                map.put("inwardTypes",1);
+                map.put("orderNumber",orderNumber);
+            }else {
+                map.put("inwardTypes",3);
+                map.put("orderNumber",orderNumber);
+            }
+        }
+
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber);
         if(selectMap == null){
             throw new Exception("该车已进厂！！");
@@ -257,21 +273,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         String subString = orderNumber.substring(0,orderNumber.length() - 1);
         map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(subString));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
-        //调用计时作业方法
-        if (orderType.intValue()==21){
-            //通过运输订单号查找订单id
-            BigDecimal orderId = utilsMapper.getOrderIdByOrderNumber(orderNumber);
-            //首先判断是否还有计时开始
-            BigDecimal startTime = utilsMapper.getTime(orderId);
-            //如果计时已经开始
-            if (startTime==null){
-                map.put("inwardTypes",1);
-                map.put("orderNumber",orderNumber);
-            }else {
-                map.put("inwardTypes",3);
-                map.put("orderNumber",orderNumber);
-            }
-        }
+
         switch (orderType.intValue()){
             case 1:
             case 4: