From bcabf203137529f13a824511eff95e9355c564c3 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Thu, 21 Nov 2024 17:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=A3=85=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=89=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?ptr=E6=9B=BF=E6=8D=A2=E6=98=AF=E9=9C=80=E8=A6=81=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=9B=AE=E8=A7=86=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java
index 9b4ce05..70b0652 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java
@@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -438,7 +439,14 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                         orderAssemblyList = orderAssembly;
                     }
                 }
+                /**
+                 * 原pisces逻辑
+                 * add by aix 2017.4.11 增加根据PTR维护页面维护的目视单显示项来替换WORKORDERASSEMBLY中的partdesc
+                 */
                if (!Objects.isNull(orderAssemblyList)){
+                   if (orderAssemblyList.getDisplaySeq()!=null && orderAssemblyList.getDisplaySeq()!=0){
+                       orderAssemblyList.setDisplayValue(mesPartPtr.getVisualItem());
+                   }
                    orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo());
                    orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName());
                    orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule());
@@ -482,6 +490,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             workOrderPartRao.saveAll(workOrderPartList);
             mesWorkOrder.setProductSeq(productSeq);
             mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
+            mesWorkOrder.setPtrInfo(ptrInfos.toString());
             ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
             mesWorkOrderRao.insert(mesWorkOrder);
             /**