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

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

@@ -101,13 +101,17 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //查询所有正在进行进厂排队的销售订单
     List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map);
 
+
+    //根据总实绩查询装车实绩
     BigDecimal getResultId(BigDecimal totalId);
 
+    //根据总实绩id查询运输订单类型
     Integer getOrderType(BigDecimal totalId);
 
     //根据运输id查询所有的零星物资出厂实绩
     List<Map<String, Object>> getSporadicSuppliesLoadResult(Map<String, Object> map);
 
-    List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object>mapVal);
+   //获取达州钢铁内转实绩
+    List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapVal);
 
 }

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

@@ -77,7 +77,7 @@ public interface ITmstruckLoadResultService{
     //新增达州站-厂内装车实绩
     int addDaZhouToDaGangLoadResult(Map<String, Object> map);
 
-
+   //查询采购内转装车实绩
     List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval);
 
 }

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

@@ -116,6 +116,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:
+                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
             case 13:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
         }
@@ -146,6 +147,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
+
         String substring = orderNumber.substring(0, orderNumber.length() - 1);
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring);
         if(selectMap == null){

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

@@ -130,6 +130,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
+                return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);
             case 13:
                 return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);
         }

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

@@ -90,6 +90,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
+            case  12:
+                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
             case 13:
                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
         }

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

@@ -1550,6 +1550,7 @@
             order by "resultLoadStartTime" desc
         </if>
     </select>
+<!--  获取采购内转装车实绩  -->
     <select id="getCgNzLoadingResult" resultType="java.util.Map" parameterType="java.lang.Integer">
           select *from ( select OO.ORDER_NUMBER              "orderNumber",
                        OOM.ORDER_MATERIAL_WEIGHT    "orderMaterialWeight",