From c5b6d239e7baf371f6668cfd11178c50badccd24 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Thu, 19 Dec 2024 14:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=2044421=20PTR=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 c3594f1..654d168 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
@@ -432,12 +432,17 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                         custFlag = true;
                     }
                 }
-                ptrFlag = true;
+
                 if (!isCust && mesPartPtr.getIsInterPrt()==CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
                     if (!fOrderFlag){
                         fOrderFlag = true;
                     }
                 }
+                if (!isCust && mesPartPtr.getIsInterPrt()!=CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
+                    if (!ptrFlag){
+                        ptrFlag = true;
+                    }
+                }
                 //将工单类零件表替换位PTR条件中维护的替换零件
                 MesPartSap mesPartSap = mesPartSapService.getMesPartSapByPartNo(mesPartPtr.getDestPartNo(), organizeCode);
                 orderPart.setPartNo(mesPartSap.getPartNo());
@@ -491,12 +496,10 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             }
 
         }
-        if (ptrFlag && custFlag){
+        if (custFlag || ptrFlag){
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue());
-        }else if (ptrFlag && fOrderFlag){
+        }else if (fOrderFlag){
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.F.getValue());
-        }else if (ptrFlag){
-            mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue());
         }
         else {
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue());