修改

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

@@ -934,9 +934,11 @@
         ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         CASE
-        WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
+        WHEN bdo.CONSIGNEE_ID is null and bdo.PRICE_VALUE is null and bdo.REMARK is not null
+        then null
+        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",
         ASM.EAS_PRIMARY_ID "closeEntryId",
@@ -1109,6 +1111,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
@@ -1124,7 +1128,8 @@
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         AND TWR.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
-        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+        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 TMSTRUCK_LEAVE_FACTORY_RESULT TLFR