tijiaio

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

@@ -1050,14 +1050,15 @@
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        WHERE TUR.RESULT_END_TIME IS NOT NULL
+        WHERE TWR.RESULT_NET_WEIGHT IS NOT NULL
         AND OO.ORDER_TYPE = 11
+        AND  OO.ORDER_STATUS = 2
         <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TUR.RESULT_END_TIME
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME)
         </if>
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TUR.RESULT_END_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TUR.RESULT_END_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME)
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME)
         </if>
 		GROUP BY MATERIAL_NAME, WAREHOUSE_NAME
 		)
@@ -1763,6 +1764,8 @@
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        left join TMSTRUCK_UNLOAD_RESULT tur on  tur.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC1 on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join RMS_TRUCK_CALCULATE RTC2 on RTC2.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
@@ -1773,8 +1776,8 @@
         left join RMS_SHIPPER RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
         left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
         left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
-        left join RMS_WAREHOUSE RW1 on ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW1.WAREHOUSE_ID
-        left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW1 on TUR.RESULT_UNLOAD_PLACE_ID = RW1.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2 on TLR.LOADING_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         <where>