”修改“

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

@@ -41,7 +41,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //通过总实绩ID查询卸货点
     BigDecimal getUnloadPointId(Map<String, Object> map);
-//    通过总实绩ID查询卸货点
+//    通过运输订单id查询卸车实绩
     List<Map<String, Object>> getSporadicSuppliesUnloadResult(Map<String, Object> map);
 
     //根据运输订单号查询物资id优先级

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

@@ -77,10 +77,10 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //    根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getFactorySkinSporadicJIPi(Map<String, Object> map);
-//    根据运输订单Id获取计皮实绩
+    //根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getSporadicSuppliesJiPiResult(Map<String, Object> map);
 
-//    根据运输订单Id获取计毛实绩
+     //根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
 
     BigDecimal getXqCgWeightIdByLineAndOrderId(Map<String, Object> map);

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

@@ -116,9 +116,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:
-                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
+                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
             case 13:
-                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
+                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;
     }

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

@@ -112,6 +112,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
                 return tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
+            case 13:
+                return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
         return null;
     }

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

@@ -1242,23 +1242,31 @@
         select *
         from (
         select TER.RESULT_ID "resultId",
-               OO.ORDER_ID      "orderId",
+               OO.ORDER_ID    "orderId",
                 OO.ORDER_NUMBER "orderNumber",
                 RC.CAPACITY_NUMBER "capacityNumber",
                 RG.GATEPOST_NAME "gatepostName",
                 TER.RESULT_ENTRY_MODE "resultEntryMode",
-                TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime"
+                TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+                RM.MATERIAL_NAME "materialName",
+                OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+                OOM.ORDER_MATERIAL_WEIGHT "materialWeight"
+
         from TMSTRUCK_ENFACTORY_RESULT TER
         left join TMSTRUCK_TOTAL_RESULT TTR
-            on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
-            on TTR.ORDER_ID = OO.ORDER_ID
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
-            on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-                   left join RMS_GATEPOST RG
-                   on RG.GATEPOST_ID = TER.GATEPOST_ID
-                          left join RMS_CAPACITY RC
-                          on RC.CAPACITY_ID = OO.CAPACITY_ID
+        on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+        left join RMS_GATEPOST RG
+        on RG.GATEPOST_ID = TER.GATEPOST_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_TYPE = #{orderTypee}
         )
         <where>

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

@@ -2192,6 +2192,7 @@
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        RM.MATERIAL_NAME "materialName",
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus"
 
@@ -2202,6 +2203,10 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID=OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=OOM.MATERIAL_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
@@ -2378,12 +2383,17 @@
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime"
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        RM.MATERIAL_NAME "materialName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID=OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=OOM.MATERIAL_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         left join RMS_CAPACITY RC