ad

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

@@ -191,11 +191,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 2:
             case 3:
-                //查询司机是否已确认订单 如果订单未确认 则不允许出厂
-                Integer driverConfirmation = utilsMapper.getDriverConfirmation(orderId);
-                if(driverConfirmation == null){
-                    throw new Exception("请提醒司机确认订单！");
-                }
                 Map<String, Object> mesMap = new HashMap<>();
                 mesMap.put("orderId", orderId);
                 mesMap.put("orderType", orderType);

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

@@ -161,6 +161,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         map.putAll(selectMap);
         map.put("orderNumber", substring);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
         //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
@@ -169,6 +170,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 2:
             case 3:
+                //查询司机是否已确认订单 如果订单未确认 则不允许出厂
+                Integer driverConfirmation = utilsMapper.getDriverConfirmation(orderId);
+                if(driverConfirmation == null){
+                    throw new Exception("请提醒司机确认订单！");
+                }
                 i += utilsService.closeOrderNormally(map);
                 break;
             case 4: