修改

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

@@ -2510,9 +2510,9 @@
         CASE
             WHEN bdo.CONSIGNEE_ID is null and bdo.PRICE_VALUE is null and bdo.REMARK is not null
             then null
-            WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
+            WHEN TWR.RESULT_GROSS_WEIGHT is null
             then null
-            when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
+            when TWR.RESULT_GROSS_WEIGHT is not null
             then ASM.MATERIAL_NUMBER
             end "materialNum",
         (CASE
@@ -2694,6 +2694,8 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
+        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
@@ -2708,8 +2710,8 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
         AND TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
-        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO ON BDO.order_id = oo.order_id
+        and (bdo.WEIGHT_TASK_RESULT_ID = twr.WEIGHT_TASK_RESULT_ID or bdo.WEIGHT_BATCH_ID = twb.WEIGHT_BATCH_ID)
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
         ON actp.PRICE_ID = OO.PRICE_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp2
@@ -2722,8 +2724,7 @@
         ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
         LEFT JOIN RMS_CONSIGNEE RC2
         ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
-        LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
-        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
+
         WHERE ASO.SALE_TYPE = 1
         and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
         and ASM.SALE_MATERIAL_ID IS NOT NULL
@@ -2895,9 +2896,9 @@
         CASE
         WHEN bdo.CONSIGNEE_ID is null and bdo.PRICE_VALUE is null and bdo.REMARK is not null
         then null
-        WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
+        WHEN TWR.RESULT_GROSS_WEIGHT is null
         then null
-        when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
+        when TWR.RESULT_GROSS_WEIGHT is not null
         then ASM.MATERIAL_NUMBER
         end "materialNum",
         (CASE
@@ -3083,6 +3084,8 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
+        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
@@ -3097,8 +3100,8 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
         AND TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
-        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO ON BDO.order_id = oo.order_id
+        and (bdo.WEIGHT_TASK_RESULT_ID = twr.WEIGHT_TASK_RESULT_ID or bdo.WEIGHT_BATCH_ID = twb.WEIGHT_BATCH_ID)
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
         ON actp.PRICE_ID = OO.PRICE_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp2
@@ -3113,8 +3116,7 @@
         ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
         left join BMSTRUCK_STATEMENT BS
         ON BS.STATEMENT_ID = BDO.STATEMENT_ID
-        LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
-        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
+
         WHERE ASO.SALE_TYPE = 1
         and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
         and ASM.SALE_MATERIAL_ID IS NOT NULL