From 1576f26bf74e718f178a2fa599f4011455aadece Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 27 Mar 2025 10:21:39 +0800
Subject: [PATCH] 2025-03-27

---
 .../resources/mapper/project/ProjectDao.xml   |  4 +-
 .../TechnicalSpecificationMapper.xml          | 48 ++++++++++++++++---
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index f173c42c..bb19e59e 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -86,10 +86,10 @@
            productSet
     FROM plm_project_info
         <where>
-             <if test="query.id != null">
+            <if test="query.id != null">
                 AND id = #{query.id}
             </if>
-              <if test="query.customerProjectNo != null and query.customerProjectNo != ''">
+            <if test="query.customerProjectNo != null and query.customerProjectNo != ''">
                 AND customer_project_no like #{query.customerProjectNo}
             </if>
             <if test="query.site != null and query.site != ''">
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index b301d63f..1d1d2cbf 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -990,10 +990,30 @@ id
 
 
 <select id="searchBMBomDetail" resultType="com.spring.modules.part.vo.BomDetailVo">
-    select a.site,a.part_no,a.alternative_no,a.alternative_description,a.bom_type,a.eng_chg_level,a.min_lot_qty,a.default_flag,
-    a.note_text,a.create_date,a.create_by,a.update_date,a.update_by,a.status,a.official_flag,B.eff_phase_in_date,B.eff_phase_out_date
-    from plm_bom_detail a left join plm_bom_header b on a.site=b.site and a.part_no=b.part_NO AND A.eng_chg_level=B.eng_chg_level
-    where a.part_no=#{partNo} and a.site=#{site} and a.bom_type!='Repair' and a.status='Buildable'
+    select a.site,
+           a.part_no,
+           b.alternative_no,
+           b.alternative_description,
+           a.bom_type,
+           a.eng_chg_level,
+           b.min_lot_qty,
+           b.default_flag,
+           a.note_text,
+           a.create_date,
+           a.create_by,
+           a.update_date,
+           a.update_by,
+           b.status,
+           a.official_flag,
+           a.eff_phase_in_date,
+           a.eff_phase_out_date
+    from plm_bom_header a
+             left join plm_bom_detail b
+                       on a.site = b.site and a.part_no = b.part_NO and a.bom_type = b.bom_type AND A.eng_chg_level = B.eng_chg_level
+    where a.part_no = #{partNo}
+      and a.site = #{site}
+      and a.bom_type != 'Repair'
+      and b.status = 'Buildable'
 </select>
 <update id="updateBMBomRev">
     update plm_technical_specification_sheet set bom_type=#{bomType},eng_chg_level=#{engChgLevel,jdbcType=INTEGER},
@@ -1005,9 +1025,23 @@ id
 </update>
 
 <select id="searchRouteDetail" resultType="com.spring.modules.part.vo.RoutingDetailVo">
-    select a.site,a.part_no,a.routing_revision,a.routing_type,a.alternative_no,a.alternative_description,a.status,a.official_flag,b.phase_in_date,b.phase_out_date
-    from plm_routing_detail a left join plm_routing_header b on a.site=b.site  and a.part_no=b.part_NO AND A.routing_revision=B.routing_revision
-     where a.site=#{site} and a.part_no=#{partNo}  and a.routing_type!='Repair' and a.status='Buildable'
+    select a.site,
+           a.part_no,
+           a.routing_revision,
+           a.routing_type,
+           b.alternative_no,
+           b.alternative_description,
+           b.status,
+           a.official_flag,
+           a.phase_in_date,
+           a.phase_out_date
+    from plm_routing_header a
+             left join plm_routing_detail b
+                       on a.site = b.site and a.part_no = b.part_NO and a.routing_type = b.routing_type AND A.routing_revision = B.routing_revision
+    where a.site = #{site}
+      and a.part_no = #{partNo}
+      and a.routing_type != 'Repair'
+      and b.status = 'Buildable'
 </select>
 
 <select id="searchBMRemarkPage" resultType="PlmTechnicalSpecificationSheetData">