From 7c2e63f3b9d4495230fab35562fe1bed628133a9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 09:09:22 +0800
Subject: [PATCH] Merge branch 'dev_New' into jtwy

---
 src/main/resources/mapper/production/ProductStructureMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index e4a0795..aae9668 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -16,11 +16,14 @@
                p.product_name,
                pp.name as  process_name,
                pm.product_id,
-               pm.model
+               pm.model,
+               pm.drawing_number,
+               pb.bom_no
         from
             product_structure ps
                 left join product_model pm on ps.product_model_id = pm.id
                 left join product p on pm.product_id = p.id
+                left join product_bom pb on ps.bom_id = pb.id
                 left join product_process pp on ps.process_id = pp.id
         where ps.bom_id = #{bomId}
         order by ps.id
@@ -30,7 +33,8 @@
                p.product_name,
                pp.name as  process_name,
                pm.product_id,
-               pm.model
+               pm.model,
+               pm.drawing_number
         from
             product_structure ps
                 left join product_model pm on ps.product_model_id = pm.id

--
Gitblit v1.9.3