From b0d8164345c4684c6c3ab64e6b66d7b227e34051 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 22 Apr 2025 16:10:39 +0800
Subject: [PATCH] 2025-04-22

---
 src/main/java/com/spring/modules/test/vo/TestSoBomVo.java     | 4 ++++
 .../resources/mapper/Tooling/ProjectToolingApplyMapper.xml    | 2 +-
 src/main/resources/mapper/quote/QuoteDetailMapper.xml         | 2 +-
 src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml    | 2 +-
 src/main/resources/mapper/test/TestSoBomMapper.xml            | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/spring/modules/test/vo/TestSoBomVo.java b/src/main/java/com/spring/modules/test/vo/TestSoBomVo.java
index 55b58541..6061bcde 100644
--- a/src/main/java/com/spring/modules/test/vo/TestSoBomVo.java
+++ b/src/main/java/com/spring/modules/test/vo/TestSoBomVo.java
@@ -23,4 +23,8 @@ public class TestSoBomVo extends TestSoBom {
      * 规格型号
      */
     private String spec;
+
+    private String plmPartNo;
+
+    private String ifsPartNo;
 }
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index ae79f4c6..15f1e33c 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -232,7 +232,7 @@
                b.operation_name,
                g.customer_part_no,
                h.part_desc,
-               h.final_part_no  ifs_part_no,
+               h.final_part_no  as ifs_part_no,
                d.node_id,
                d.node_name,
                h.plm_part_no,
diff --git a/src/main/resources/mapper/quote/QuoteDetailMapper.xml b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
index 4a052ceb..bcf12137 100644
--- a/src/main/resources/mapper/quote/QuoteDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteDetailMapper.xml
@@ -322,7 +322,7 @@
                 and q.project_no = #{projectNo}
             </if>
             <if test="partNo != null and partNo != ''">
-                and qd.part_no = #{partNo}
+                and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo}
             </if>
         </where>
         order by qd.part_no
diff --git a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
index 2391c9d7..a85d4760 100644
--- a/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml
@@ -316,7 +316,7 @@
                 and q.project_no = #{projectNo}
             </if>
             <if test="partNo != null and partNo != ''">
-                and qd.part_no = #{partNo}
+                and qd.part_no = #{partNo} or pp.ifs_part_no = #{partNo}
             </if>
         </where>
         order by qd.part_no
diff --git a/src/main/resources/mapper/test/TestSoBomMapper.xml b/src/main/resources/mapper/test/TestSoBomMapper.xml
index 8fd6145c..ff15c5d7 100644
--- a/src/main/resources/mapper/test/TestSoBomMapper.xml
+++ b/src/main/resources/mapper/test/TestSoBomMapper.xml
@@ -25,7 +25,9 @@
             p.spec,
             dbo.get_um_name(p.um_id) as umName,
             tb.unit_cost,
-            tb.total_cost
+            tb.total_cost,
+            p.plm_part_no,
+            p.ifs_part_no
         from plm_test_so_bom tb
         left join part p on tb.site = p.site and tb.component_part_no = p.part_no
         <where>