From 5635693af37ee9a701d437100861eea0210d3212 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 25 Sep 2024 17:02:36 +0800
Subject: [PATCH] 1127

---
 .../data/PlmProjectToolApplyHeaderData.java       |  1 +
 .../impl/ProjectToolingApplyServiceImpl.java      |  2 +-
 .../mapper/Tooling/ProjectToolingApplyMapper.xml  | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
index 485b29bf..9d3cecd7 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
@@ -21,4 +21,5 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
 
     private String userName;
     private String menuId;
+    private String orderRef1;
 }
diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
index d3ff5c80..caea38cc 100644
--- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
@@ -127,7 +127,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                 plm.setSite(item.getSite());
                 plm.setApplyNo(newApplyNo);
                 plm.setSeqNo(index+1);
-                plm.setToolId(item.getToolDescription());
+                plm.setToolId(item.getToolId());
                 plm.setStandardCost(new BigDecimal(item.getStandardCost()));
                 plm.setApplyQty(item.getApplyQty());
                 plm.setRemark(item.getRemark());
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index 76eb3dbb..9fec10ee 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -106,8 +106,19 @@
     <select id="searchToolApplyDetail" resultType="PlmProjectToolApplyDetailData">
    select a.site,a.apply_no,a.seqNo,a.tool_id,a.standard_cost,a.applyQty,a.remark,a.orderRef1,a.orderRef2,a.orderRef3,a.orderRef4,
 a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operation_no,b.operation_name
-    from plm_project_tool_applyDetail a left join plm_routing_component b on a.orderRef1=b.site and a.orderRef6=convert(varchar(20),b.operation_id)
-    where a.site=#{site} and a.apply_no=#{applyNo} order  by seqNo
+    from plm_project_tool_applyDetail a left join plm_routing_component b on a.site=b.site and a.orderRef6=convert(varchar(20),b.operation_id)
+      <where>
+       <if test="site != null and site != ''">
+            AND a.site = #{site}
+       </if>
+       <if test="applyNo != null and applyNo != ''">
+            AND a.apply_no = #{applyNo}
+       </if>
+       <if test="orderRef1 != null and orderRef1 != ''">
+            AND a.orderRef1 = #{orderRef1}
+       </if>
+      </where>
+    order  by a.apply_no, a.seqNo
     </select>
 
     <select id="checkToolApplyHeaderData" resultType="PlmProjectToolApplyHeaderData">