From 6fef709dade0aee4d63e420d4a8486af96cc1849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 9 Mar 2025 18:55:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=88=90=E6=9C=AC=E5=88=86=E6=9E=90):=20?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E6=88=90=E6=9C=AC=E6=B7=BB=E5=8A=A0=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=B2=B9=E6=BC=86=E9=87=8D=E9=87=8F=E5=92=8C=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=9A=84=E5=B7=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/technology/pojo/dto/EBomCostCacheDTO.java | 5 +++++ .../nflg/product/technology/pojo/dto/ProductionCostDTO.java | 5 +++++ .../com/nflg/product/technology/pojo/vo/NameCostInfoVO.java | 3 +++ .../product/technology/service/BomCostCalculateService.java | 3 +++ .../technology/service/ProductCostAnalysisService.java | 2 ++ 5 files changed, 18 insertions(+) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomCostCacheDTO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomCostCacheDTO.java index d7062d7a..d251607b 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomCostCacheDTO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomCostCacheDTO.java @@ -74,6 +74,11 @@ public class EBomCostCacheDTO implements Serializable { */ private BigDecimal paintCost = BigDecimal.ZERO; + /** + * 油漆重量 + */ + private BigDecimal paintWeight = BigDecimal.ONE; + /** * 制作成本 */ diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/ProductionCostDTO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/ProductionCostDTO.java index 613cd264..26bf05aa 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/ProductionCostDTO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/ProductionCostDTO.java @@ -17,4 +17,9 @@ public class ProductionCostDTO implements Serializable { * 成本 */ private BigDecimal cost = BigDecimal.ZERO; + + /** + * 工时 + */ + private BigDecimal workHours = BigDecimal.ZERO; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/NameCostInfoVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/NameCostInfoVO.java index 4232ccc9..4af38797 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/NameCostInfoVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/NameCostInfoVO.java @@ -30,4 +30,7 @@ public class NameCostInfoVO implements Serializable { @ApiModelProperty("占比") private String ratio; + + @ApiModelProperty("额外信息") + private BigDecimal additional; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/BomCostCalculateService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/BomCostCalculateService.java index c6f80454..8ac049d1 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/BomCostCalculateService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/BomCostCalculateService.java @@ -152,6 +152,7 @@ public class BomCostCalculateService { cdto.setAuxiliaryDepartmentLaborCost(cdto.getAuxiliaryDepartmentLaborCost().add(c.getAuxiliaryDepartmentLaborCost().multiply(dto1.getNum()))); cdto.setAuxiliaryDepartmentExpenses(cdto.getAuxiliaryDepartmentExpenses().add(c.getAuxiliaryDepartmentExpenses().multiply(dto1.getNum()))); cdto.setPaintCost(cdto.getPaintCost().add(c.getPaintCost().multiply(dto1.getNum()))); + cdto.setPaintWeight(cdto.getPaintWeight().add(dto1.getNum())); if (CollectionUtil.isNotEmpty(c.getProductionCosts())) { c.getProductionCosts().forEach(pc -> { ProductionCostDTO pdto = cdto.getProductionCosts().parallelStream() @@ -164,6 +165,7 @@ public class BomCostCalculateService { cdto.getProductionCosts().add(pdto); } pdto.setCost(pdto.getCost().add(pc.getCost().multiply(dto1.getNum()))); + pdto.setWorkHours(pdto.getWorkHours().add(pc.getWorkHours().multiply(dto1.getNum()))); }); } } @@ -207,6 +209,7 @@ public class BomCostCalculateService { dto.setCost(hourlyWages.add(benefit).add(auxiliaryMaterialsAndConsumables).add(feeEquipmentDepreciation) .add(feeWorkshopLaborCost).add(feeWorkshopOffice).add(auxiliaryDepartmentLaborCosts).add(assistantFee) .multiply(gs)); + dto.setWorkHours(gs); productionCosts.add(dto); if (dto.getCost().compareTo(BigDecimal.ZERO) > 0) { log.debug(StrUtil.format( diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java index a79cf56d..df21b2dc 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java @@ -486,12 +486,14 @@ public class ProductCostAnalysisService { paintNameCostInfoVO.setName("油漆费用"); paintNameCostInfoVO.setCost(cost.getPaintCost()); paintNameCostInfoVO.setRatio(calculateRatio(cost.getPaintCost(), manufactureCostTotal)); + paintNameCostInfoVO.setAdditional(cost.getPaintWeight()); nameCostInfoVOS.add(paintNameCostInfoVO); cost.getProductionCosts().forEach(pc -> { nameCostInfoVOS.add(new NameCostInfoVO() .setName(pc.getName()) .setCost(pc.getCost()) .setRatio(calculateRatio(pc.getCost(), manufactureCostTotal)) + .setAdditional(pc.getWorkHours()) ); }); manufactureCostVO.setTotalCost(manufactureCostTotal);