xiugai1

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

@@ -271,6 +271,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         HashSet<Map<String,Object>> filterTruckRemark = new HashSet<>();
         HashSet<Map<String,Object>> filterAreaName = new HashSet<>();
         int totalNumber = 0;
+        BigDecimal totalNetWeight = new BigDecimal(0);
         for (int j = 0; j < saleSteelReport.size();j++) {
             Map<String,Object> stringObjectMap = saleSteelReport.get(j);
             //车牌号筛选
@@ -369,6 +370,7 @@ 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")));
             }
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
             //确认是否有多个收货单位
@@ -409,6 +411,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             saleSteelReport.get(0).put("quxiaoCapacityNum",quxiaoSet.size());
             saleSteelReport.get(0).put("totalCapacity",set.size());
             saleSteelReport.get(0).put("totalNumber",totalNumber);
+            saleSteelReport.get(0).put("totalNetWeight",totalNetWeight);
             saleSteelReport.get(0).put("filterConsigneeList",filterConsigneeList);
             saleSteelReport.get(0).put("filtermaterialNameList",filtermaterialNameList);
             saleSteelReport.get(0).put("filterorderStatus",filterorderStatus);
@@ -420,7 +423,6 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             saleSteelReport.get(0).put("filterSaleRemark",filterSaleRemark);
             saleSteelReport.get(0).put("filterTruckRemark",filterTruckRemark);
             saleSteelReport.get(0).put("filterAreaName",filterAreaName);
-
         }
         return saleSteelReport;
     }