From 1278f3f13e80d7ef635990e8d8c4112a56cb3d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 6 Jan 2025 19:41:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=88=90=E6=9C=AC=E5=88=86=E6=9E=90):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E6=9D=90=E6=96=99=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=97=B6=E7=9A=84=E7=89=A9=E6=96=99=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/technology/pojo/dto/EBomDTO.java | 4 ++-- .../technology/service/BomCostCalculateService.java | 7 +++++-- .../main/resources/mapper/master/MaterialMainMapper.xml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomDTO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomDTO.java index cd106661..6192a2d0 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomDTO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/dto/EBomDTO.java @@ -28,9 +28,9 @@ public class EBomDTO { private String materialUnit; /** - * 最近采购价格 + * 物料价格 */ - private BigDecimal lastPurchasePrice; + private BigDecimal materialPrice; /** * 物料分类编码 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 191c47e2..e930c5ea 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 @@ -201,6 +201,9 @@ public class BomCostCalculateService { .add(auxiliaryDepartmentLaborCosts).add(assistantFee) .multiply(getGsForWorkingType(d, workHours, vw))); productionCosts.add(dto); + if (dto.getCost().compareTo(BigDecimal.ZERO) > 0) { + log.debug(StrUtil.format("BOM成本计算 {} 制作成本 {},价格: {}", d.getMaterialNo(), dto.getName(), dto.getCost())); + } } return productionCosts; } @@ -288,12 +291,12 @@ public class BomCostCalculateService { } private BigDecimal calculatePurchasedPartsCost(EBomDTO dto) { - return Optional.ofNullable(dto.getLastPurchasePrice()).orElse(BigDecimal.ZERO); + return Optional.ofNullable(dto.getMaterialPrice()).orElse(BigDecimal.ZERO); } private BigDecimal calculateSteelsCost(EBomDTO dto) { //是钢材 - BigDecimal price = Optional.ofNullable(dto.getLastPurchasePrice()).orElse(BigDecimal.ZERO); + BigDecimal price = Optional.ofNullable(dto.getMaterialPrice()).orElse(BigDecimal.ZERO); BigDecimal unitWeight = Optional.ofNullable(dto.getNum()).orElse(BigDecimal.ZERO); BigDecimal wastage = BigDecimal.ZERO; if (StrUtil.isNotBlank(dto.getRawMaterialGroup())) { diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/MaterialMainMapper.xml index 8e1aa23b..4c793c1f 100644 --- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -82,7 +82,7 @@ select m.row_id AS 'materialRowId',m.material_no AS 'materialNo',m.drawing_no AS 'drawingNo' ,m.material_desc AS 'materialDesc',m.material_unit AS 'materialUnit' ,CONVERT(m.material_weight, DECIMAL(12,4)) AS 'unitWeight',m.material_category_code AS - 'materialCategoryCode',m.last_purchase_price AS 'lastPurchasePrice' + 'materialCategoryCode',m.material_price AS 'materialPrice' ,c.rel_category_code AS 'relCategoryCode',c.category_name AS 'categoryName' ,m.raw_material_group AS 'rawMaterialGroup',m.material_stock AS 'inventory',t.plan_delivery_time AS 'leadTime' from t_material_main m