From af54ee2ebe79bb5450334e682d0f66097e71cc00 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 6 Nov 2024 22:17:02 +0800
Subject: [PATCH] 1127

---
 src/main/resources/mapper/project/ProjectDao.xml              | 2 +-
 .../mapper/sampleManagement/TechnicalSpecificationMapper.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 29556d60..3e5a0a7f 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -385,7 +385,7 @@
     dbo.get_userDisPlay(planner) plannerName,dbo.plm_get_test_part_name(site,test_part_no) partName
     ,status ,dbo.plm_get_projectBaseDesc(status,'purchaseRequest_status') statusDesc
     from plm_tool_purchase_request
-    where site=${site} and project_id=#{projectId}
+    where site=#{site} and project_id=#{projectId}
 </select>
 
 <insert id="savePlmToolPurchaseRequestData">
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index d83eda0b..7d5d6a20 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -389,7 +389,7 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction,
 <select id="searchBMPropertiesValue" resultType="PlmBmPropertiesValueData">
     select a.Site,a.bu_no,a.PartNo,a.CodeNo,a.SubCodeSeqNo,a.SubCodeDesc,a.ItemNo,a.PropertiesItemNo,a.TextValue,a.NumValue,a.RecordType,a.order_id,b.itemDesc,b.ValueType_DB,b.ValueChooseFlag
     from plm_bm_propertiesValue a left join plm_properties_item b on a.PropertiesItemNo=b.ItemNo and  a.site=b.site and a.RecordType=b.ItemType
-    where a.site=${site} and a.bu_no=#{buNo}  and a.RecordType='BM' and a.CodeNo=#{type} and a.PartNo=#{codeNo} order by a.order_id
+    where a.site=#{site} and a.bu_no=#{buNo}  and a.RecordType='BM' and a.CodeNo=#{type} and a.PartNo=#{codeNo} order by a.order_id
 </select>
 
 <select id="getAvailableValueList" resultType="PlmPropertiesItemAvailableData">
@@ -926,7 +926,7 @@ id
     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'
+    where a.part_no=#{partNo} and a.site=#{site} and a.bom_type!='Repair' and a.status='Buildable'
 </select>
 <update id="updateBMBomRev">
     update plm_technical_specification_sheet set bom_type=#{bomType},eng_chg_level=#{engChgLevel,jdbcType=INTEGER},