修改

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

@@ -370,7 +370,12 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             filterAreaName.add(filterAreaNameMap);
             if(!"取消".equals(stringObjectMap.get("newCapacityNo"))) {
                 totalNumber += Integer.parseInt(stringObjectMap.get("materialNum").toString());
-                totalNetWeight = totalNetWeight.add(DataChange.dataToBigDecimal(stringObjectMap.get("netWeight")));
+                if(j == 0) {
+                    totalNetWeight = totalNetWeight.add(DataChange.dataToBigDecimal(stringObjectMap.get("netWeight")));
+                }
+                if(j > 0 && DataChange.dataToBigDecimal(stringObjectMap.get("weightBatchId")).compareTo(DataChange.dataToBigDecimal(saleSteelReport.get(j-1).get("weightBatchId"))) != 0) {
+                    totalNetWeight = totalNetWeight.add(DataChange.dataToBigDecimal(stringObjectMap.get("netWeight")));
+                }
             }
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
             //确认是否有多个收货单位

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

@@ -2062,7 +2062,7 @@
                     ELSE TWR.RESULT_NET_WEIGHT
                     END
                     ) "netWeight",
-
+                    TWR.RESULT_NET_WEIGHT   "toExcelNetWeight",
                     TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
                     TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
                     TER.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime",
@@ -2624,7 +2624,7 @@
         ELSE TWR.RESULT_NET_WEIGHT
         END
         ) "netWeight",
-
+        TWR.RESULT_NET_WEIGHT   "toExcelNetWeight",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
         TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
@@ -3010,7 +3010,7 @@
         ELSE TWR.RESULT_NET_WEIGHT
         END
         ) "netWeight",
-
+        TWR.RESULT_NET_WEIGHT   "toExcelNetWeight",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
         TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
@@ -3529,7 +3529,7 @@
                                LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
                                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                                         AND TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                                AND TWR.MATERIAL_ID = ASM.material_id
                        WHERE
                            ASO.SALE_TYPE = 4
                          AND ASO.DELETED = 0
@@ -3775,6 +3775,7 @@
         WHERE ASO.SALE_TYPE = 1
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+        ORDER BY TWB.WEIGHT_BATCH_ID DESC
     </select>
 
     <select id="queryAddress" resultType="java.lang.String">