diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 3c28379..3be9b1f 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -684,7 +684,9 @@ public class TbsBudgetApplicationService { //无匹配的预算 if(!isMatch){ if (throwEx){ - Assert.throwEx("匹配品类时预算不足["+ activityCostItem.getTargetCode()+"]"); + Assert.throwEx("匹配品类时预算不足["+ activityCostItem.getTargetCode() + +"],成本中心:"+activityCostItem.getCenterName() + +",科目:"+activityCostItem.getSubjectName()); } log.warn("[{}]{} 预算不足,成本中心:{},科目:{}",activityCostItem.getTargetCode() ,activityCostItem.getTargetName(),activityCostItem.getCenterName(),activityCostItem.getSubjectName()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java index abf347a..040f7f8 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java @@ -342,7 +342,11 @@ public class PortalOfCost2Application { } @NotNull - private List getTbsActivityCenterGoods(BmsSupplier supplier, BmsSubject subject, BigDecimal OneHundred, List processGoodsItems, String costCode, LocalDate nowDate, LocalDate startDate, LocalDate endDate, Long supplierId, BigDecimal totalAmount, TbsActivity activity, List activityCenterList, List activityGoodsList) { + private List getTbsActivityCenterGoods(BmsSupplier supplier, BmsSubject subject, BigDecimal OneHundred, + List processGoodsItems, String costCode, LocalDate nowDate, + LocalDate startDate, LocalDate endDate, Long supplierId, BigDecimal totalAmount, + TbsActivity activity, List activityCenterList, + List activityGoodsList) { List activityCenterGoodsList = new ArrayList<>(); for (TbsActivityCenter activityCenter : activityCenterList) { @@ -384,29 +388,16 @@ public class PortalOfCost2Application { centerGoods.setTargetLevelPathIds(activityGoods.getTargetLevelPathIds()); centerGoods.setTargetLevelPathNames(activityGoods.getTargetLevelPathNames()); // 分配金额 - if (costCode.contains("YX06")){ - if(i+1== activityGoodsList.size()){ - centerGoods.setCenterGoodsAmount(yx06Surplus); - centerGoods.setCenterGoodsRate(yx06SurplusRate); - centerGoods.setUsedAmount(yx06Surplus); - }else { - yx06SurplusRate = yx06SurplusRate.subtract(yx06Rate); - yx06Surplus = yx06Surplus.subtract(yx06ItemAmt); - centerGoods.setCenterGoodsAmount(yx06ItemAmt); - centerGoods.setCenterGoodsRate(yx06Rate); - centerGoods.setUsedAmount(yx06ItemAmt); - } + if(i+1== activityGoodsList.size()){ + centerGoods.setCenterGoodsAmount(yx06Surplus); + centerGoods.setCenterGoodsRate(yx06SurplusRate); + centerGoods.setUsedAmount(yx06Surplus); }else { - BigDecimal totalSkuAmt = BigDecimal.ZERO; - for (ProcessGoodsItem goodsItem : processGoodsItems) { - if(goodsItem.getInventoryCode().equals(activityGoods.getTargetCode())){ - totalSkuAmt = totalSkuAmt.add(goodsItem.getAmount()); - } - } - BigDecimal rate = totalSkuAmt.divide(totalAmount, RoundingMode.UP); - centerGoods.setCenterGoodsAmount(totalSkuAmt); - centerGoods.setCenterGoodsRate(rate); - centerGoods.setUsedAmount(totalSkuAmt); + yx06SurplusRate = yx06SurplusRate.subtract(yx06Rate); + yx06Surplus = yx06Surplus.subtract(yx06ItemAmt); + centerGoods.setCenterGoodsAmount(yx06ItemAmt); + centerGoods.setCenterGoodsRate(yx06Rate); + centerGoods.setUsedAmount(yx06ItemAmt); } activityCenterGoodsList.add(centerGoods); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 1f0ee2f..7406721 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -914,7 +914,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl