添加进出厂限制按照路段顺序号执行

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

@@ -151,6 +151,13 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber);
         if(selectMap == null){
             throw new Exception("该车已进厂！！");
+        }else{
+            BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            //如果当前路段顺序号 +1 不等于进厂路段顺序号 则不允许进厂 （针对同一路线多次进厂情况）
+            if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
+                throw  new Exception("作业环节未到进厂！");
+            }
         }
         map.putAll(selectMap);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));

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

@@ -165,6 +165,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(substring);
         if(selectMap == null){
             throw new Exception("该车已出厂！！");
+        }else{
+            BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            //如果当前路段顺序号 +1 不等于出厂路段顺序号 则不允许出厂
+            if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
+                throw  new Exception("该车作业环节未全部完成！");
+            }
         }
         map.putAll(selectMap);
         map.put("orderNumber", substring);

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

@@ -661,6 +661,7 @@
                TER.RESULT_TOTAL_ID        "resultTotalId",
                RC.CAPACITY_NUMBER         "capacityNumber",
                TER.SEGMEN_SQE             "segmentSqe", --进厂的路段顺序号
+               OO.ORDER_LINE_SEQUENCE       "orderSegmentSqe",
                ter.result_entry_gate_time
           from OMSTRUCK_ORDER OO
           left join TMSTRUCK_TOTAL_RESULT TTR

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

@@ -595,7 +595,8 @@
                         TTR.RESULT_TOTAL_ID "resultTotalId",
                         OO.CAPACITY_ID      "capacityId",
                         RC.CAPACITY_NUMBER  "capacityNumber",
-                        TLFR.SEGMENT_SQE    "segmentSqe"
+                        TLFR.SEGMENT_SQE    "segmentSqe",
+                        OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
                  from OMSTRUCK_ORDER OO
                           left join TMSTRUCK_TOTAL_RESULT TTR
                                     on OO.ORDER_ID = TTR.ORDER_ID