更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -2227,6 +2227,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         Double carTotal = 0d;//车数合计
         Double netWeightTotal = 0d;//净重合计
         Double amountIngPayableTotal = 0d;//合计应付合计
+        Double netWeightTmp = 0d;//合计应付合计
         Map<String, Object> pageView = new HashMap<>();
         //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
@@ -2241,7 +2242,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-
+                if(!StringUtils.isEmpty(exportVView.getWaterContent())
+                        &&!StringUtils.isEmpty(exportVView.getImpurity())
+                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
+                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
+                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                    //水分累计和
+                    netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
+                }
                 //水分累计和
                 waterContentTotal = waterContentTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getWaterContent()) ? exportVView.getWaterContent() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
                 impurityTotal = impurityTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getImpurity()) ? exportVView.getImpurity() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
@@ -2286,22 +2295,22 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleDetail);
         //水分平均值
         cell = rowp.createCell(13);
-        cell.setCellValue(bulkDensityTotal / netWeightTotal);
+        cell.setCellValue(bulkDensityTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(14);
-        cell.setCellValue(waterContentTotal / netWeightTotal);
+        cell.setCellValue(waterContentTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(15);
-        cell.setCellValue(mildewGrainTotal / netWeightTotal);
+        cell.setCellValue(mildewGrainTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(16);
-        cell.setCellValue(impurityTotal / netWeightTotal);
+        cell.setCellValue(impurityTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(17);
-        cell.setCellValue(jiaorenliTotal / netWeightTotal);
+        cell.setCellValue(jiaorenliTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(18);
-        cell.setCellValue(imperfectGrainTotal / netWeightTotal);
+        cell.setCellValue(imperfectGrainTotal / netWeightTmp);
         cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(19);
         cell.setCellStyle(styleDetail);
@@ -3070,10 +3079,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double carTotal = 0d;//车数合计
             Double netWeightTotal = 0d;//净重合计
             Double amountIngPayableTotal = 0d;//合计应付合计
+            Double netWeightTmp = 0d;//合计应付合计
             for (int i = 0; i < dataList.size(); i++) {
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
+                if(!StringUtils.isEmpty(exportVView.getWaterContent())
+                        &&!StringUtils.isEmpty(exportVView.getImpurity())
+                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
+                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
+                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                    //水分累计和
+                    netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
+                }
                 //水分累计和
                 waterContentTotal = waterContentTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getWaterContent()) ? exportVView.getWaterContent() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
                 impurityTotal = impurityTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getImpurity()) ? exportVView.getImpurity() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
@@ -3116,22 +3135,22 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             //水分平均值
             cell = rowp.createCell(13);
-            cell.setCellValue(waterContentTotal / netWeightTotal);
+            cell.setCellValue(waterContentTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(14);
-            cell.setCellValue(impurityTotal / netWeightTotal);
+            cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(15);
-            cell.setCellValue(mildewGrainTotal / netWeightTotal);
+            cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
-            cell.setCellValue(imperfectGrainTotal / netWeightTotal);
+            cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
-            cell.setCellValue(bulkDensityTotal / netWeightTotal);
+            cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
-            cell.setCellValue(jiaorenliTotal / netWeightTotal);
+            cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
             cell.setCellStyle(styleDetail);
@@ -3901,9 +3920,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double netWeightPriceTotal = 0d;//单价合计
             Double netWeightTotal = 0d;//净重合计
             Double amountIngPayableTotal = 0d;//应收合计
+            Double netWeightTmp = 0d;//应收合计
             for (int i = 0; i < dataList.size(); i++) {
                 ExportVView exportVView = dataList.get(i);
-
+                if(!StringUtils.isEmpty(exportVView.getWaterContent())
+                        &&!StringUtils.isEmpty(exportVView.getImpurity())
+                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
+                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
+                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                    //水分累计和
+                    netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
+                }
                 //水分累计和
                 waterContentTotal = waterContentTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getWaterContent()) ? exportVView.getWaterContent() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
                 impurityTotal = impurityTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getImpurity()) ? exportVView.getImpurity() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
@@ -3951,21 +3979,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //水分平均值
             cell = rowp.createCell(14);
             cell.setCellStyle(contextstyle1);
-            cell.setCellValue(waterContentTotal / netWeightTotal);
+            cell.setCellValue(waterContentTotal / netWeightTmp);
             cell = rowp.createCell(15);
-            cell.setCellValue(impurityTotal / netWeightTotal);
+            cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
-            cell.setCellValue(mildewGrainTotal / netWeightTotal);
+            cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
-            cell.setCellValue(imperfectGrainTotal / netWeightTotal);
+            cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
-            cell.setCellValue(bulkDensityTotal / netWeightTotal);
+            cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
-            cell.setCellValue(jiaorenliTotal / netWeightTotal);
+            cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);
@@ -4764,10 +4792,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double netWeightPriceTotal = 0d;//单价合计
             Double netWeightTotal = 0d;//净重合计
             Double amountIngPayableTotal = 0d;//应收合计
+            Double netWeightTmp = 0d;//应收合计
             for (int i = 0; i < dataList.size(); i++) {
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
+                if(!StringUtils.isEmpty(exportVView.getWaterContent())
+                        &&!StringUtils.isEmpty(exportVView.getImpurity())
+                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
+                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
+                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                    //水分累计和
+                    netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
+                }
                 //水分累计和
                 waterContentTotal = waterContentTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getWaterContent()) ? exportVView.getWaterContent() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
                 impurityTotal = impurityTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getImpurity()) ? exportVView.getImpurity() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
@@ -4814,21 +4852,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             //水分平均值
             cell = rowp.createCell(14);
             cell.setCellStyle(contextstyle1);
-            cell.setCellValue(waterContentTotal / netWeightTotal);
+            cell.setCellValue(waterContentTotal / netWeightTmp);
             cell = rowp.createCell(15);
-            cell.setCellValue(impurityTotal / netWeightTotal);
+            cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(16);
-            cell.setCellValue(mildewGrainTotal / netWeightTotal);
+            cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(17);
-            cell.setCellValue(imperfectGrainTotal / netWeightTotal);
+            cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(18);
-            cell.setCellValue(bulkDensityTotal / netWeightTotal);
+            cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(19);
-            cell.setCellValue(jiaorenliTotal / netWeightTotal);
+            cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
             cell = rowp.createCell(20);
             cell.setCellStyle(styleDetail);