修改

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

@@ -237,9 +237,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
-//        if(checkMeasureCommission == 0){
-//            throw new Exception("委托发送失败");
-//        }
+        if(checkMeasureCommission == 0){
+            throw new Exception("委托发送失败");
+        }
         i += tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(generateEnFactoryResult(map)); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);

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

@@ -266,17 +266,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
                 }
                 break;
-            case 11:
-                i += utilsService.closeOrderNormally(map);
-                break;
             case 12:
             case 13:
             case 15:
             case 16:
-                //生成新的零星订单
-                omsFeign.pushMessageToDriver(map);
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
+                //生成新的零星订单
+                omsFeign.pushMessageToDriver(map);
                 break;
 
 
@@ -292,6 +289,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         //添加门岗
         tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
+        //添加路段顺序号
+        tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("Sqe")));
         //添加出厂时间
         tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
         tmstruckLeaveFactoryResult.setInsertTime(new Date());

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

@@ -1020,7 +1020,6 @@
         OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
         RW1.WAREHOUSE_NAME "loadingName",
         RW2.WAREHOUSE_NAME "unloadingName"
-
         from TMSTRUCK_ENFACTORY_RESULT TER
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID

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

@@ -492,7 +492,7 @@
             on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSsoId != null">
             left join RMS_CARRIER RCA
-                on RCA.CARRIER_ID = RC.CARRIER_ID
+                on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID

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

@@ -205,7 +205,6 @@
         left join RMS_CAPACITY RC
             on OO.CAPACITY_ID = RC.CAPACITY_ID
         where  OO.order_Number=#{orderNumber}
-
     </select>
 
     <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">