From 7d253993d7d9fe2fdfa287a6cec76e32bf0754c7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 16 三月 2026 13:37:11 +0800
Subject: [PATCH] bom添加产品编码

---
 src/main/java/com/ruoyi/production/dto/ProductBomDto.java       |    3 +++
 src/main/resources/mapper/production/ProductBomMapper.xml       |    3 ++-
 src/main/resources/mapper/production/ProductStructureMapper.xml |    3 ++-
 src/main/java/com/ruoyi/production/dto/ProductStructureDto.java |    5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
index ab695ca..8468f82 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
@@ -15,4 +15,7 @@
     //浜у搧瑙勬牸鍨嬪彿
     private String productModelName;
 
+    //浜у搧缂栫爜
+    private String productCode;
+
 }
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index ec43eef..b52c596 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -15,12 +15,17 @@
     @ApiModelProperty(value = "宸ヨ壓鍚嶇О")
     private String processName;
 
+    @ApiModelProperty(value = "浜у搧缂栫爜")
+    private String productCode;
+
     @ApiModelProperty(value = "浜у搧鍚嶇О")
     private String productName;
 
     @ApiModelProperty(value = "浜у搧id")
+    //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material
     private Long productId;
 
+    @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
     private String model;
 
     @TableField(exist = false)
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index e812b2c..9c84a51 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -21,7 +21,8 @@
         SELECT
         pb.*,
         pms.model AS productModelName,
-        pm.product_name AS productName
+        pm.product_name AS productName,
+        pms.material_code AS productCode
         FROM product_bom pb
         LEFT JOIN product_material_sku pms ON pb.product_model_id = pms.id
         LEFT JOIN product_material pm ON pms.product_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 8a707ba..e5e692e 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -17,7 +17,8 @@
                pm.product_name as product_name,
                pp.name         as process_name,
                pms.product_id as product_id,
-               pms.model       as model
+               pms.model       as model,
+               pms.material_code       as productCode
         from product_structure ps
                  left join product_material_sku pms on ps.product_model_id = pms.id
                  left join product_material pm on pms.product_id = pm.id

--
Gitblit v1.9.3