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

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

@@ -168,7 +168,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             throw new Exception("该车已进厂！！");
         }else{
             BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
-            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
             //如果当前路段顺序号 +1 不等于进厂路段顺序号 则不允许进厂 （针对同一路线多次进厂情况）
             if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
                 throw  new Exception("作业环节未到进厂！");

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

@@ -181,7 +181,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             throw new Exception("该车已出厂！！");
         }else{
             BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
-            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
             //如果当前路段顺序号 +1 不等于出厂路段顺序号 则不允许出厂
             if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
                 throw  new Exception("该车作业环节未全部完成！");

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

@@ -204,7 +204,8 @@
                OO.ORDER_ID      "orderId",
                OO.ORDER_LINE_SEQUENCE "Sqe",
                OO.LINE_ID           "lineId",
-               RC.CAPACITY_NUMBER   "capacityNumber"
+               RC.CAPACITY_NUMBER   "capacityNumber",
+               OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID