”修改测试“

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

@@ -114,4 +114,10 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
    //获取达州钢铁内转实绩
     List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapVal);
 
+    //获取装货实绩备注
+    Map<String,Object> getInsertUpdateRemark(BigDecimal orderId);
+
+    //修改装货路段顺序号
+    int updateSqe(BigDecimal orderId);
+
 }

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

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

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

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

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

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

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

@@ -108,11 +108,26 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 12:
             case 13:
             case 15:
+            case 20:
             case 16:
                  return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }
         return null;
     }
+     //判断装货是否含有备注
+    @Override
+    public int LoadJudge(Map<String, Object> map) {
+        BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
+        //判断装货实绩是否含有未装货备注
+        Map<String, Object> map1 = tmstruckLoadResultMapper.getInsertUpdateRemark(orderId);
+        String remark =(String) map1.get("remark");
+        if (remark.contains("未装货")){
+            BigDecimal lineSeq =(BigDecimal) map1.get("lineSeq");
+
+        }
+
+        return 0;
+    }
 
     /**
      * 新增采购装车实绩  / 内转装车实绩

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

@@ -118,6 +118,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 12:
             case 13:
             case 15:
+            case 20:
             case 16:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }

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

@@ -135,6 +135,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 12:
             case 13:
             case 15:
+            case 20:
             case 16:
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
 
@@ -175,6 +176,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 13:
 //                return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
             case 15:
+            case 20:
             case 16:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }

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

@@ -1617,4 +1617,19 @@
                      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"
+    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}
+  </select>
+  <update id="updateSqe" parameterType="java.math.BigDecimal">
+    update OMSTRUCK_ORDER OO
+    set OO.ORDER_LINE_SEQUENCE=#{seq}
+    where OO.ORDER_ID=#{orderId}
+  </update>
 </mapper>