修改导出

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

@@ -2251,7 +2251,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + exportVView.getAmountIngPayable();
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
             }
         }
 
@@ -2627,7 +2627,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editFloat(exportVView.getPureWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
@@ -3079,7 +3079,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + exportVView.getAmountIngPayable();
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
             }
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
@@ -3448,7 +3448,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editFloat(exportVView.getPureWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());