Merge branch 'dev-temp-castle-2412181729-44421' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java

@@ -437,12 +437,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());
@@ -496,12 +501,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());