asd

src/main/java/com/steerinfo/dil/mapper/UtilsMapper.java

@@ -72,4 +72,6 @@ public interface UtilsMapper {
     //通过人员管理SSOID查询人员ID
     Integer getPersonnelIdBySsoId(String personnelSsoId);
 
+    //查询订单是否确认
+    Integer getDriverConfirmation(BigDecimal orderId);
 }

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

@@ -153,9 +153,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         map.putAll(selectMap);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
-        //修改路段顺序号
-        i += utilsService.updateOrderLineSequence(map);
         //判断委托是否发送成功
         int checkMeasureCommission = 0;
         switch (orderType.intValue()){
@@ -194,6 +191,11 @@ 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);
@@ -262,6 +264,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");
         }
+        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+        //修改路段顺序号
+        i += utilsService.updateOrderLineSequence(map);
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
     }

src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -161,4 +161,11 @@
         from RMS_PERSONNEL RP
         where RP.PERSONNEL_SSO_ID = #{personnelSsoId}
     </select>
+
+<!--  查询订单是否确认  -->
+    <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.DRIVER_CONFIRMATION
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>