From 0711e14f71b860a2deb5d021d9eb1d516bb0048d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 15:47:32 +0800
Subject: [PATCH] refactor(production): 优化ProductionOrderBom实体和相关逻辑
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java | 21 ++++++---------------
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 7 +++----
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
index 7086222..3915d97 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
@@ -3,11 +3,8 @@
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import java.io.Serializable;
-import java.math.BigDecimal;
/**
* <p>
@@ -28,26 +25,20 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "鐖惰妭鐐笽D")
- private Long parentId;
-
@Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @Schema(description = "宸ュ簭id")
- private Long technologyOperationId;
+ @Schema(description = "BOM缂栧彿")
+ private String bomNo;
- @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
- private BigDecimal unitQuantity;
+ @Schema(description = "澶囨敞")
+ private String remark;
- @Schema(description = "闇�姹傛暟閲�")
- private BigDecimal demandedQuantity;
-
- @Schema(description = "鍗曚綅")
- private String unit;
+ @Schema(description = "鐗堟湰鍙�")
+ private String version;
@Schema(description = "bom鐨刬d")
private Long bomId;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index f1ea57d..9be6ae2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -297,10 +297,9 @@
orderBom.setProductionOrderId(productionOrder.getId());
orderBom.setBomId(Long.valueOf(technologyBom.getId()));
orderBom.setProductModelId(root != null ? root.getProductModelId() : productionOrder.getProductModelId());
- orderBom.setTechnologyOperationId(root == null ? null : root.getOperationId());
- orderBom.setUnitQuantity(root != null && root.getUnitQuantity() != null ? root.getUnitQuantity() : BigDecimal.ONE);
- orderBom.setDemandedQuantity(orderQuantity);
- orderBom.setUnit(root == null ? null : root.getUnit());
+ orderBom.setRemark(technologyBom.getRemark());
+ orderBom.setBomNo(technologyBom.getBomNo());
+ orderBom.setVersion(technologyBom.getVersion());
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
--
Gitblit v1.9.3