From 00924fac832ce423049193455f2fd1b6a86cba61 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 21 Sep 2023 08:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/service/impl/BirCenterRateServiceImpl.java | 8 ++++---- .../modules/sale/controller/SalePlanController.java | 8 ++++++-- .../modules/sale/service/SalePlanGoodsService.java | 3 +++ .../sale/service/impl/SalePlanGoodsServiceImpl.java | 10 +++++++++- .../tbs/service/impl/TbsCostApplyServiceImpl.java | 9 ++++----- .../vtb/service/impl/VtbVerificationServiceImpl.java | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index e899ae52..773465e9 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -292,7 +292,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { costCenter.setQtdCusCenterSend(totalDispatchQty.toString()); String qtyCusCenterRateString = null; if(totalDispatchQty.compareTo(BigDecimal.ZERO) != 0){ - qtyCusCenterRateString = totalCostQty.divide(totalDispatchQty,RoundingMode.DOWN).toString(); + qtyCusCenterRateString = totalCostQty.divide(totalDispatchQty,4,RoundingMode.DOWN).toString(); } costCenter.setQtdCusCenterExpenseRate(qtyCusCenterRateString); costCenter.setQtdCusCenterTargetExpenseRate(targetRateDTO.getCusTargetRateQty()); @@ -300,7 +300,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { costCenter.setYtdCusCenterSend(totalDispatchYear.toString()); String ytdCusCenterRateString = null; if(totalDispatchYear.compareTo(BigDecimal.ZERO) != 0){ - ytdCusCenterRateString = totalCostYear.divide(totalDispatchYear,RoundingMode.DOWN).toString(); + ytdCusCenterRateString = totalCostYear.divide(totalDispatchYear,4,RoundingMode.DOWN).toString(); } costCenter.setYtdCusCenterExpenseRate(ytdCusCenterRateString); costCenter.setYtdCusCenterTargetExpenseRate(targetRateDTO.getCusTargetRate()); @@ -353,10 +353,10 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { } } if(cusCostTarget.compareTo(BigDecimal.ZERO)!=0&&cusDispatchTarget.compareTo(BigDecimal.ZERO)!=0){ - cusTargetRate = cusCostTarget.divide(cusDispatchTarget,RoundingMode.DOWN).toString(); + cusTargetRate = cusCostTarget.divide(cusDispatchTarget,4,RoundingMode.DOWN).toString(); } if(cusCostTargetQty.compareTo(BigDecimal.ZERO)!=0&&cusDispatchTargetQty.compareTo(BigDecimal.ZERO)!=0){ - cusTargetRateQty = cusCostTargetQty.divide(cusDispatchTargetQty,RoundingMode.DOWN).toString(); + cusTargetRateQty = cusCostTargetQty.divide(cusDispatchTargetQty,4,RoundingMode.DOWN).toString(); } return new CusTargetRateDTO(cusTargetRateQty,cusTargetRate); } diff --git a/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java b/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java index 8aa644d6..9c0a93a9 100644 --- a/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java +++ b/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java @@ -9,7 +9,9 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.sale.entity.SalePlanGoods; import com.qs.serve.modules.sale.entity.bo.SalePlanBo; +import com.qs.serve.modules.sale.service.SalePlanGoodsService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,7 +34,8 @@ import java.util.List; @RequestMapping("sale/plan") public class SalePlanController { - private SalePlanService salePlanService; + private final SalePlanService salePlanService; + private final SalePlanGoodsService salePlanGoodsService; /** * 列表 @@ -66,9 +69,10 @@ public class SalePlanController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.SALE, title = "销售计划", biz = BizType.QUERY) - @PreAuthorize("hasRole('sale:plan:query')") public R getById(@PathVariable("id") String id){ SalePlan salePlan = salePlanService.getById(id); + List planGoodsList = salePlanGoodsService.listByPlanId(salePlan.getId()); + salePlan.setPlanGoodsList(planGoodsList); return R.ok(salePlan); } diff --git a/src/main/java/com/qs/serve/modules/sale/service/SalePlanGoodsService.java b/src/main/java/com/qs/serve/modules/sale/service/SalePlanGoodsService.java index 623aa8eb..8a5a0015 100644 --- a/src/main/java/com/qs/serve/modules/sale/service/SalePlanGoodsService.java +++ b/src/main/java/com/qs/serve/modules/sale/service/SalePlanGoodsService.java @@ -3,6 +3,8 @@ package com.qs.serve.modules.sale.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.sale.entity.SalePlanGoods; +import java.util.List; + /** * 销售计划商品 服务接口 * @author YenHex @@ -10,5 +12,6 @@ import com.qs.serve.modules.sale.entity.SalePlanGoods; */ public interface SalePlanGoodsService extends IService { + List listByPlanId(Long painId); } diff --git a/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanGoodsServiceImpl.java index bde605ec..a55c02e3 100644 --- a/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanGoodsServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.sale.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -7,7 +8,7 @@ import org.springframework.stereotype.Service; import com.qs.serve.modules.sale.entity.SalePlanGoods; import com.qs.serve.modules.sale.service.SalePlanGoodsService; import com.qs.serve.modules.sale.mapper.SalePlanGoodsMapper; - +import java.util.List; /** * 销售计划商品 服务实现类 * @author YenHex @@ -18,5 +19,12 @@ import com.qs.serve.modules.sale.mapper.SalePlanGoodsMapper; @AllArgsConstructor public class SalePlanGoodsServiceImpl extends ServiceImpl implements SalePlanGoodsService { + @Override + public List listByPlanId(Long painId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SalePlanGoods::getPlanId,painId); + return super.list(lqw); + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 0dcc97aa..87f54f6f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -937,7 +937,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl subList = new ArrayList<>(); //创建子表数据 try { - this.buildSubList(tbsActivityCenters, subjectNames, subList); + this.buildSubList(tbsActivityCenters, subjectNames, subList,supplier.getCode()); } catch (Exception e) { log.error("【费用申请，创建子表数据】：{}",e.getMessage()); } @@ -1013,18 +1013,17 @@ public class TbsCostApplyServiceImpl extends ServiceImpl tbsActivityCenters, List subjectNames, List subList) { + private void buildSubList(List tbsActivityCenters, List subjectNames, List subList,String supplierCode) { for (String subjectName : subjectNames) { subList.add(new TbsCostSubItem.Subject(subjectName)); } //成本中心去重 Map> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a->a.getCenterType()+"-"+a.getCenterId())); List centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList()); - // TODO 有异常 + //有异常 for(TbsActivityCenter center : centerList){ - TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName()); + TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),supplierCode); subList.add(costCenter); - } } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 2f0b3c41..3b535b62 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -854,7 +854,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl activityCenter = activityCenterService.listByActivity(verification.getActivityId()); for(TbsActivityCenter center : activityCenter){ - TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName()); + TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),activity.getSupplierCode()); subList.add(costCenter); } } catch (Exception e) {