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 @@ OutWorkOrderFlag, InternalLeadTime, LastUpdateBy, - PRTOPOTemp + PRTOPOTemp, + lifespan, + toolInstanceId VALUES @@ -240,7 +242,9 @@ #{outworkorderflag,jdbcType=CHAR}, #{internalleadtime,jdbcType=FLOAT}, #{lastupdateby,jdbcType=VARCHAR}, - #{prtopotemp,jdbcType=VARCHAR} + #{prtopotemp,jdbcType=VARCHAR}, + #{lifespan}, + #{toolInstanceId}