修改零星

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

@@ -115,9 +115,12 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapVal);
 
     //获取装货实绩备注
-    Map<String,Object> getInsertUpdateRemark(BigDecimal orderId);
+    Map<String,Object> getInsertUpdateRemark(BigDecimal resultTotalId);
+
+    //根据路径id查找最大路段顺序号
+    Integer Maxseq(BigDecimal lineId);
 
     //修改装货路段顺序号
-    int updateSqe(BigDecimal orderId);
+    int updateSqe(@Param("seq")int seq,@Param("orderId")BigDecimal orderId);
 
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLoadResultService.java

@@ -24,7 +24,7 @@ public interface ITmstruckLoadResultService{
     List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
 
     //判断装货实绩是否含有“未装货”，如果含有未装货，则将路段顺序号减1
-    int LoadJudge(Map<String,Object> map);
+    int loadJudge(Map<String,Object> map);
 
     //生成装车实绩(销售)
     int addLoadResult(Map<String, Object> map);

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

@@ -118,7 +118,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 15:
-            case 20:
             case 16:
             case 20:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416

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

@@ -145,7 +145,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 15:
             case 20:
             case 16:
-            case 20:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;

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

@@ -116,17 +116,15 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
      //判断装货是否含有备注
     @Override
-    public int LoadJudge(Map<String, Object> map) {
-        BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
+    public int loadJudge(Map<String, Object> map) {
+        int i=0;
         //判断装货实绩是否含有未装货备注
-        Map<String, Object> map1 = tmstruckLoadResultMapper.getInsertUpdateRemark(orderId);
-        String remark =(String) map1.get("remark");
-        if (remark.contains("未装货")){
-            BigDecimal lineSeq =(BigDecimal) map1.get("lineSeq");
-
-        }
-
-        return 0;
+        BigDecimal orderId =(BigDecimal) map.get("orderId");
+        BigDecimal lineId =(BigDecimal) map.get("lineId");
+        //获得最大路段顺序号
+        Integer maxSeq = tmstruckLoadResultMapper.Maxseq(lineId);
+        i = tmstruckLoadResultMapper.updateSqe(maxSeq - 1,orderId);
+        return i;
     }
 
     /**
@@ -292,16 +290,25 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-        tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
-        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新路段顺序号
-        i += utilsService.updateOrderLineSequence(map);
+        int i = utilsService.updateOrderLineSequence(map);
+        //判断是否为未转货
+        if (map.get("insertUpdateRemark")!=null) {
+            String insertUpdateRemark = (String) map.get("insertUpdateRemark");
+            if("未装货".equals(insertUpdateRemark)){
+//                loadJudge(orderMap);
+            }
+            tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
+        }
+        tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
+        i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+
         //推送消息到websocket
         utilsService.pushMesToWebsocket((String) orderMap.get("capacityNumber"), "装货");
         return i;
     }
 
+
     /**
      * 添加装车标准时长ID
      * @param orderNumber

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

@@ -629,7 +629,9 @@
     <select id="selectTotalResultIdByCpAndOn" parameterType="java.util.Map" resultType="java.util.Map">
         select TTR.RESULT_TOTAL_ID "resultTotalId",
                RC.CAPACITY_NUMBER "capacityNumber",
-               OO.ORDER_TYPE       "orderType"
+               OO.ORDER_TYPE       "orderType",
+               OO.ORDER_ID          "orderId",
+               OO.LINE_ID           "lineId"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID

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

@@ -1617,17 +1617,25 @@
                      and TLR.RESULT_LOAD_END_TIME IS NULL
                      and OO.ORDER_TYPE = #{orderType})
   </select>
-  <select id="getInsertUpdateRemark" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-    select OO.ORDER_LINE_SEQUENCE "lineSeq",
-           TLR.INSERT_UPDATE_REMARK "remark"
+  <select id="getInsertUpdateRemark" resultType="java.util.Map" parameterType="java.util.Map">
+    select OO.LINE_ID "lineId",
+           OO.ORDER_ID "orderId"
     from OMSTRUCK_ORDER OO
     left join TMSTRUCK_TOTAL_RESULT TTR
     on TTR.ORDER_ID=OO.ORDER_ID
     left join TMSTRUCK_LOAD_RESULT TLR
     on  TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
-    where OO.ORDER_ID=#{orderId}
+    where TTR.RESULT_TOTAL_ID=#{resultTotalId}
+  </select>
+
+  <select id="Maxseq" resultType="int" parameterType="java.math.BigDecimal">
+    select MAX(RLS.SEGMENT_SQE)
+    from RMS_LINE RL
+    left join RMS_LINE_SEGEMNT RLS
+    on RL.LINE_ID=RLS.LINE_ID
+    where  RL.LINE_ID=#{lineId}
   </select>
-  <update id="updateSqe" parameterType="java.math.BigDecimal">
+  <update id="updateSqe" parameterType="java.util.Map">
     update OMSTRUCK_ORDER OO
     set OO.ORDER_LINE_SEQUENCE=#{seq}
     where OO.ORDER_ID=#{orderId}