修改

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

@@ -144,7 +144,7 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
                 try {
                     List<Map<String,Object>> deleteList= new ArrayList();
                     for(Map<String,Object> lastMap : deliveryOrderMaterialList) {
-                       if(!(lastMap.get("materialWeight") != null && !"".equals(lastMap.get("materialWeight")))){
+                       if(!(lastMap.get("netWeightTime") != null && !"".equals(lastMap.get("netWeightTime")))){
                             deleteList.add(lastMap);
                        }
                     }

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

@@ -2113,6 +2113,7 @@
                     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 TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                               ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                     LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
@@ -2460,6 +2461,7 @@
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         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 AMS_CONTRACT_TRANSPORT_PRICE actp
@@ -2779,6 +2781,7 @@
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         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 AMS_CONTRACT_TRANSPORT_PRICE actp
@@ -3362,8 +3365,7 @@
         ON TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON   TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
-        and twr.SALE_MATERIAL_ID is not null
-        OR ( TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID AND TWR.MATERIAL_ID = RM.MATERIAL_ID and twr.sale_material_id is null )
+        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 TMSTRUCK_LOAD_RESULT TLR
@@ -3532,6 +3534,7 @@
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         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 TMSTRUCK_LOAD_RESULT TLR
 --         ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
 --         AND TLR.MATERIAL_ID = RM.MATERIAL_ID