1

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

@@ -2397,15 +2397,16 @@ 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")));
-                }
+//                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")));
+//                }
+                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"))));