From fea30b2dddb37179f9cedcabab44222f0346980c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 13 Mar 2024 13:37:37 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-13=20=E7=89=A9=E6=96=99=EF=BC=8Cbom?=
 =?UTF-8?q?=EF=BC=8Crouting=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/part/BomSearch3Mapper.xml          | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/mapper/part/BomSearch3Mapper.xml b/src/main/resources/mapper/part/BomSearch3Mapper.xml
index a4102f2e..a07f61d0 100644
--- a/src/main/resources/mapper/part/BomSearch3Mapper.xml
+++ b/src/main/resources/mapper/part/BomSearch3Mapper.xml
@@ -63,35 +63,38 @@
     <!-- 查bom子明细 -->
     <select id="getComponentPartList" parameterType="com.spring.modules.part.vo.BomDetailVo" resultType="com.spring.modules.part.vo.BomComponentVo">
         SELECT
-            site,
-            part_no,
-            bom_type,
-            eng_chg_level,
-            alternative_no,
-            component_part,
-            dbo.get_part_name(site, component_part) as componentPartDesc,
-            print_unit,
-            dbo.get_um_name(print_unit) as printUnitName,
-            qty_per_assembly,
-            component_scrap,
-            issue_type,
-            case when issue_type = 'A' then '领退料倒冲'
-                 when issue_type = 'B' then '工单倒冲'
-                 when issue_type = 'C' then '生产订单倒冲'
-                 when issue_type = 'D' then '投料倒冲'
-                 when issue_type = 'E' then '批次倒冲'
-                 when issue_type = 'F' then '销售订单倒冲'
-                 when issue_type = 'G' then '项目倒冲'
+            a.site,
+            a.part_no,
+            a.bom_type,
+            a.eng_chg_level,
+            a.alternative_no,
+            a.component_part,
+            dbo.get_part_name(a.site, a.component_part) as componentPartDesc,
+            a.print_unit,
+            dbo.get_um_name(a.print_unit) as printUnitName,
+            a.qty_per_assembly,
+            a.component_scrap,
+            a.issue_type,
+            case when a.issue_type = 'A' then '领退料倒冲'
+                 when a.issue_type = 'B' then '工单倒冲'
+                 when a.issue_type = 'C' then '生产订单倒冲'
+                 when a.issue_type = 'D' then '投料倒冲'
+                 when a.issue_type = 'E' then '批次倒冲'
+                 when a.issue_type = 'F' then '销售订单倒冲'
+                 when a.issue_type = 'G' then '项目倒冲'
                  else '' end as issueTypeName,
-            shrinkage_factor,
-            line_item_no,
-            operation_name,
-            issue_to_loc,
-            dbo.get_location_name(site, issue_to_loc) as issueToLocName,
-            note_text,
-            line_sequence
-        FROM plm_bom_component
-        where site = #{site} and part_no = #{partNo} and bom_type = #{bomType} and eng_chg_level = #{engChgLevel} and alternative_no = #{alternativeNo}
-        order by line_sequence
+            a.shrinkage_factor,
+            a.line_item_no,
+            a.operation_id,
+            b.operation_no,
+            b.operation_name,
+            a.issue_to_loc,
+            dbo.get_location_name(a.site, a.issue_to_loc) as issueToLocName,
+            a.note_text,
+            a.line_sequence
+        FROM plm_bom_component as a
+        LEFT JOIN plm_routing_component as b on a.operation_id = b.operation_id
+        where a.site = #{site} and a.part_no = #{partNo} and a.bom_type = #{bomType} and a.eng_chg_level = #{engChgLevel} and a.alternative_no = #{alternativeNo}
+        order by a.line_sequence
     </select>
 </mapper>