”修改零星展示实绩“

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

@@ -58,7 +58,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     List<Map<String, Object>> getBillOrderMaterial(String orderNumber);
 
-//    通过运输订单获取零星物资进厂实绩
+     //通过运输订单获取零星物资进厂实绩
     List<Map<String, Object>> getSporadicSuppliesEnFactoryResult(Map<String, Object> map);
 
     List<Map<String, Object>> getCGNZEnFactory(Map<String, Object> map);

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

@@ -108,7 +108,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //根据总实绩id查询运输订单类型
     Integer getOrderType(BigDecimal totalId);
 
-    //根据运输id查询所有的零星物资出厂实绩
+    //根据运输id查询所有的零星物资装车实绩
     List<Map<String, Object>> getSporadicSuppliesLoadResult(Map<String, Object> map);
 
    //获取达州钢铁内转实绩

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

@@ -68,15 +68,15 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //查询订单下所有的物资件数和物资理重
     List<Map<String, Object>> getMaterialMes(Integer orderId);
 
-
     //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
     Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
 
-    //    根据运输订单Id获取计皮实绩
+    //零星物资根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getFactorySkinSporadicJiMiao(Map<String, Object> map);
 
-    //    根据运输订单Id获取计皮实绩
+    //零星物资根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getFactorySkinSporadicJIPi(Map<String, Object> map);
+
     //根据运输订单Id获取计皮实绩
     List<Map<String, Object>> getSporadicSuppliesJiPiResult(Map<String, Object> map);
 

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

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

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

@@ -1162,7 +1162,7 @@
             and twr.MATERIAL_ID = oom.MATERIAL_ID
         where oo.order_number = #{orderNumber}
     </select>
-
+    <!--零星物资 -->
     <select id="getSporadicLeaveFactory" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
@@ -1172,12 +1172,19 @@
         RG.GATEPOST_NAME                   "gatepostName",
         TLFR.RESULT_OUT_MODE               "resultOutMode",
         TLFR.RESULT_OUT_GATE_TIME          "resultOutGateTime",
-        TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
+        TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
+        RM.MATERIAL_NAME                    "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT           "materialWeight",
+        OOM.ORDER_MATERIAL_NUMBER            "materialNumber"
         from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on OO.ORDER_ID = TTR.ORDER_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OO.ORDER_ID=OOM.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

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

@@ -1501,12 +1501,19 @@
         TLR.RESULT_ISCLEAR "resultIsclear",
         to_char(TLR.RESULT_LOAD_START_TIME, 'yyyy-mm-dd') "resultLoadStartTime",
         TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
-        TLR.INSERT_TIME "insertTime"
+        TLR.INSERT_TIME "insertTime",
+        RM.MATERIAL_NAME "materialName",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TLR.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=OOM.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_CAPACITY RC

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

@@ -369,10 +369,9 @@
     on TSR.SENDER_ID=RS.SHIPPER_ID
   </select>
     <select id="selectIdApp" resultType="java.util.Map">
-      select
-      rs.SHIPPER_APPID "AppId",
-        rs.SHIPPER_SECRETKEY "secretKey"
-      from RMS_SHIPPER RS
-      where rs.SHIPPER_ID=#{bigDecimal}
+      select rs.SHIPPER_APPID "AppId",
+             rs.SHIPPER_SECRETKEY "secretKey"
+      from   RMS_SHIPPER RS
+      where  rs.SHIPPER_ID=#{bigDecimal}
     </select>
 </mapper>

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

@@ -920,21 +920,28 @@
         TUR.RESULT_START_TIME     "resultStartTime",
         TUR.RESULT_END_TIME       "resultEndTime",
         TUR.RESULT_DURATION       "resultDuration",
-        RW.WAREHOUSE_NAME         "warehouseName"
+        RW.WAREHOUSE_NAME         "warehouseName",
+        RM.MATERIAL_NAME          "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT  "materialWeight",
+        OOM.ORDER_MATERIAL_NUMBER  "materialNumber"
 
         FROM TMSTRUCK_UNLOAD_RESULT TUR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-            ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
-            ON OO.ORDER_ID = TTR.ORDER_ID
+        ON OO.ORDER_ID = TTR.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
+        ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
         LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN RMS_WAREHOUSE RW
-            ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-                AND OO.ORDER_TYPE = 12
+        AND OO.ORDER_TYPE = 12
         )
         <where>
             <if test="orderNumber != null">

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

@@ -2471,7 +2471,7 @@
             order by "resultGrossWeightTime" desc
         </if>
     </select>
-
+<!--  零星计皮 -->
     <select id="getFactorySkinSporadicJIPi"  parameterType="java.util.Map"  resultType="java.util.Map">
         select *
         from (
@@ -2483,12 +2483,17 @@
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
-        TWR.RESULT_POUND_NO "resultPoundNo"
+        TWR.RESULT_POUND_NO "resultPoundNo",
+        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 OO.ORDER_ID=OOM.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