zxz 2 years ago
parent
commit
a3eb127ae7

+ 10 - 4
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -859,8 +859,11 @@ public class BiInfoController {
 //            }
 //            }
             // 查询已开票未开票
             // 查询已开票未开票
             ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo1.getId()));
             ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo1.getId()));
-            invoicingTotal = invoicingTotal + (contractProcessInfo.getGoodsName() != null ? contractProcessInfo.getGoodsName() : 0.00);
-            payTotal = payTotal + (contractProcessInfo.getMildewGrain() != null ? contractProcessInfo.getMildewGrain() : 0.00);
+            if(contractProcessInfo != null){
+                invoicingTotal = invoicingTotal + (contractProcessInfo.getGoodsName() != null ? contractProcessInfo.getGoodsName() : 0.00);
+                payTotal = payTotal + (contractProcessInfo.getMildewGrain() != null ? contractProcessInfo.getMildewGrain() : 0.00);
+            }
+
         }
         }
         // 执行中的所有合同量求和-- 已完成量、待完成量
         // 执行中的所有合同量求和-- 已完成量、待完成量
         BiViewInfo biViewInfo = new BiViewInfo();
         BiViewInfo biViewInfo = new BiViewInfo();
@@ -980,9 +983,12 @@ public class BiInfoController {
             completedQuantity += outWeight - returnWeight;
             completedQuantity += outWeight - returnWeight;
             // 查询已开票未开票
             // 查询已开票未开票
             ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo1.getId()));
             ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo1.getId()));
-            invoicingTotal = invoicingTotal + (contractProcessInfo.getGoodsName() != null ? contractProcessInfo.getGoodsName() : 0.00);
+            if(contractProcessInfo != null){
+                invoicingTotal = invoicingTotal + (contractProcessInfo.getGoodsName() != null ? contractProcessInfo.getGoodsName() : 0.00);
 //            payTotal += payMoney;
 //            payTotal += payMoney;
-            payTotal = payTotal + (contractProcessInfo.getMildewGrain() != null ? contractProcessInfo.getMildewGrain() : 0.00);
+                payTotal = payTotal + (contractProcessInfo.getMildewGrain() != null ? contractProcessInfo.getMildewGrain() : 0.00);
+            }
+
         }
         }
         // 执行中的所有合同量求和-- 已完成量、待完成量
         // 执行中的所有合同量求和-- 已完成量、待完成量
         BiViewInfo biViewInfo = new BiViewInfo();
         BiViewInfo biViewInfo = new BiViewInfo();