ccjgmwz 3 years ago
parent
commit
4117916ce2

+ 9 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -384,6 +384,15 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         String  amonutIn = baseMapper.getAmonutIn(pageView);
         String  amonutIn = baseMapper.getAmonutIn(pageView);
         String  amonutout = baseMapper.getAmonutOut(pageView);
         String  amonutout = baseMapper.getAmonutOut(pageView);
         String  amonutMao = baseMapper.getAmonutMao(pageView);
         String  amonutMao = baseMapper.getAmonutMao(pageView);
+        if(amonutIn == null){
+            amonutIn = "0";
+        }
+        if(amonutout == null){
+            amonutout = "0";
+        }
+        if(amonutMao == null){
+            amonutMao = "0";
+        }
         NumberFormat nf = NumberFormat.getNumberInstance();
         NumberFormat nf = NumberFormat.getNumberInstance();
         nf.setMaximumFractionDigits(2);
         nf.setMaximumFractionDigits(2);
         BiViewInfo biViewInfo = new BiViewInfo();
         BiViewInfo biViewInfo = new BiViewInfo();

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

@@ -3493,7 +3493,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(exportVView.getImperfectGrain() != null ? exportVView.getImperfectGrain() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
                 imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(exportVView.getImperfectGrain() != null ? exportVView.getImperfectGrain() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
                 bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(exportVView.getBulkDensity() != null ? exportVView.getBulkDensity() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
                 bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(exportVView.getBulkDensity() != null ? exportVView.getBulkDensity() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
                 jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(exportVView.getJiaorenli() != null ? exportVView.getJiaorenli() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
                 jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(exportVView.getJiaorenli() != null ? exportVView.getJiaorenli() : "0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0"))));
-                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(exportVView.getUnitContractPrice()));
+                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getUnitContractPrice() != null ? exportVView.getUnitContractPrice() : "0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 amountIngPayableTotal = amountIngPayableTotal + exportVView.getAmountIngReceivable();
                 amountIngPayableTotal = amountIngPayableTotal + exportVView.getAmountIngReceivable();