From 80e67c3cdaf43e160cee617af7ab6e22509a77e0 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 11 Mar 2026 15:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tooling/data/RoutingToolApplyData.java      |  1 +
 .../impl/ProjectToolingApplyServiceImpl.java    |  1 +
 .../base/entity/PlmProjectToolApplyDetail.java  |  9 +++++++++
 .../Tooling/ProjectToolingApplyMapper.xml       | 17 +++++++++++------
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/RoutingToolApplyData.java b/src/main/java/com/spring/modules/Tooling/data/RoutingToolApplyData.java
index 828a88e2..66075f01 100644
--- a/src/main/java/com/spring/modules/Tooling/data/RoutingToolApplyData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/RoutingToolApplyData.java
@@ -22,4 +22,5 @@ public class RoutingToolApplyData extends RoutingToolVo {
     private String customerPartNo;
     private String customerName;
     private String projectName;
+    private String instanceCode;
 }
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 63487458..4d94bd18 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
@@ -162,6 +162,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                 plm.setOrderRef4(item.getRoutingType());
                 plm.setOrderRef5(item.getAlternativeNo());
                 plm.setOrderRef6(item.getOperationId().toString());
+                plm.setInstanceCode(item.getInstanceCode());
                 return plm;
         }).collect(Collectors.toList());
         projectToolingApplyMapper.saveApplyDetail(applyDetail);
diff --git a/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyDetail.java b/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyDetail.java
index 35b4c758..4f1bfa9f 100644
--- a/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyDetail.java
+++ b/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyDetail.java
@@ -65,6 +65,7 @@ public class PlmProjectToolApplyDetail {
      */
     private String orderRef5;
     private String orderRef6;
+    private String instanceCode;
     public String getSite() {
         return site;
     }
@@ -176,5 +177,13 @@ public class PlmProjectToolApplyDetail {
     public void setOrderRef6(String orderRef6) {
         this.orderRef6 = orderRef6;
     }
+
+    public String getInstanceCode() {
+        return instanceCode;
+    }
+
+    public void setInstanceCode(String instanceCode) {
+        this.instanceCode = instanceCode;
+    }
 }
 
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index db804972..3f998194 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -215,21 +215,23 @@
     <insert id="saveApplyDetail">
         INSERT INTO plm_project_tool_applyDetail (site, apply_no, seqNo, tool_id, standard_cost, applyQty, remark,
                                                   orderRef1, orderRef2, orderRef3, orderRef4, orderRef5,
-                                                  orderRef6) values
+                                                  orderRef6, instance_code) values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.site}, #{item.applyNo}, #{item.seqNo}, #{item.toolId}, #{item.standardCost}, #{item.applyQty},
              #{item.remark}, #{item.orderRef1},
-             #{item.orderRef2}, #{item.orderRef3}, #{item.orderRef4}, #{item.orderRef5}, #{item.orderRef6})
+             #{item.orderRef2}, #{item.orderRef3}, #{item.orderRef4}, #{item.orderRef5}, #{item.orderRef6},
+             #{item.instanceCode})
         </foreach>
     </insert>
     <insert id="toolDetailBatchSave">
         insert into plm_project_tool_applyDetail (site, apply_no, seqNo, tool_id, standard_cost, applyQty, remark,
         orderRef1, orderRef2, orderRef3, orderRef4, orderRef5,
-        orderRef6) values
+        orderRef6, instance_code) values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.site}, #{item.applyNo}, #{item.seqNo}, #{item.toolId}, #{item.standardCost}, #{item.applyQty},
             #{item.remark}, #{item.projectId},
-            #{item.testPartNo}, #{item.routingRevision}, #{item.routingType}, #{item.alternativeNo}, #{item.operationId})
+            #{item.testPartNo}, #{item.routingRevision}, #{item.routingType}, #{item.alternativeNo}, #{item.operationId},
+            #{item.instanceCode})
         </foreach>
     </insert>
     <update id="updateRoutingToolRequireFlag">
@@ -375,6 +377,7 @@
                a.orderRef3,
                a.orderRef4,
                a.orderRef5,
+               a.instance_code,
                dbo.plm_get_toolDesc(a.site, a.tool_id)                                          toolDesc,
                a.orderRef6,
                b.operation_no,
@@ -514,7 +517,8 @@
     <update id="updateApplyDetail">
         update plm_project_tool_applyDetail
         set applyQty=#{applyQty},
-            standard_cost=#{standardCost}
+            standard_cost=#{standardCost},
+            instance_code=#{instanceCode}
         where site = #{site}
           and apply_no = #{applyNo}
           and seqNo = #{seqNo}
@@ -534,7 +538,8 @@
                orderRef4,
                orderRef5,
                unit_cost,
-               orderRef6
+               orderRef6,
+               instance_code
         FROM plm_project_tool_applyDetail
         where site = #{site}
           and apply_no = #{applyNo}