Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

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

@@ -289,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