From 2b5cb77f0ea4ce8b476c0c6c9754fbd1e80cac25 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 22 Dec 2022 16:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8A=E5=A2=9E=E5=8A=A0=E5=88=80=E5=85=B7=E5=AF=BF=E5=91=BD?=
 =?UTF-8?q?,=E5=AE=9E=E4=BE=8B=E5=8F=B7=20=EF=BC=8C=E5=A4=87=E6=B3=A8=20?=
 =?UTF-8?q?=202022=E5=B9=B412=E6=9C=8822=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/purchaseorder/entity/PRDetail.java  |  5 +++++
 .../resources/mapper/purchaseorder/PRDetailMapper.xml  | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java b/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java
index 378ac48..d4f9e69 100644
--- a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java
+++ b/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java
@@ -211,4 +211,9 @@ public class PRDetail {
     private int stepId;
 
     private String nameDesc;
+
+    private int lifespan;
+
+    private String toolInstanceId;
+
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
index 5b40eb8..68bbb5a 100644
--- a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
+++ b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
@@ -59,7 +59,7 @@
         ,isnull(C.can_auth_flag ,'N') as strCanAuthFlag
         ,(case B.ApproveResult when 'Y' then '已通过' else '未通过' end) as strApproveResult
         ,B.EnterDate as enterDate ,brl.role_desc
-        ,D.FamilyName as familyName
+        ,D.FamilyName as familyName,A.lifespan , A.toolInstanceId tool_instance_id
         from PRDetail A
         left join PRHeader B on A.RequisitionNo = B.RequisitionNo and A.Site = B.Site
         left join business_role_list brl on brl.role_item_no = B.OrderType
@@ -206,7 +206,9 @@
             <if test="outworkorderflag!=null">OutWorkOrderFlag,</if>
             <if test="internalleadtime!=null">InternalLeadTime,</if>
             <if test="lastupdateby!=null">LastUpdateBy,</if>
-            <if test="prtopotemp!=null">PRTOPOTemp</if>
+            <if test="prtopotemp!=null">PRTOPOTemp,</if>
+            <if test="lifespan!=null">lifespan,</if>
+            <if test="toolInstanceId!=null">toolInstanceId</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -240,7 +242,9 @@
             <if test="outworkorderflag!=null">#{outworkorderflag,jdbcType=CHAR},</if>
             <if test="internalleadtime!=null">#{internalleadtime,jdbcType=FLOAT},</if>
             <if test="lastupdateby!=null">#{lastupdateby,jdbcType=VARCHAR},</if>
-            <if test="prtopotemp!=null">#{prtopotemp,jdbcType=VARCHAR}</if>
+            <if test="prtopotemp!=null">#{prtopotemp,jdbcType=VARCHAR},</if>
+            <if test="lifespan!=null">#{lifespan},</if>
+            <if test="toolInstanceId!=null">#{toolInstanceId}</if>
         </trim>
     </insert>
     <update id="updatePRDetail">