mes-ptr完善逻辑

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

@@ -295,10 +295,19 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
         /**
          * 总成拆bom,变成子零件
          * 替换子零件，通过替换后的零件，去找排序工艺
+         *
+         * PTR逻辑 3种场景互斥
+         * 1.如果选择了客户发送PTR信息，遇到PTR info直接转换单
+         * 2.如果选择了内部PTR，需要看总成是否需要替换，生成F单
+         * 3.如果两个都没有选择PTR,需要看总成是否需要替换 生成P单
+         *
+         * isCustomerSendPrtInfo 1是客户发送ptr
+         * isInterPrt 1是内部ptr
          */
         Map<String,String> ptrRuleListMap = new HashMap<>();
         //是否修改为P单
         boolean isModifyPOrder = false;
+        boolean isFOrder = false;
         //查询mes_part_ptr表，根据物料清单查找ptr替换信息
         if (!workOrderPartList.isEmpty()){
             Map<String, MesWorkOrderPart> orderPartMap = workOrderPartList.stream().collect(Collectors.toMap(MesWorkOrderPart::getPartNo, Function.identity()));
@@ -308,6 +317,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                 List<String> ptrInfoList = Arrays.asList(ptrInfo.replace("_", "").split("\\|"));
                 if (!ptrInfoList.isEmpty()){
                     List<MesPartPtr> custPartPtrList = getCustPartPtrList(ptrInfoList, organizeCode);
+                    long count = custPartPtrList.stream().filter(item -> item.getIsCustomerSendPrtInfo() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()).count();
+                    if (count > 0){
                         for (MesPartPtr mesPartPtr : custPartPtrList) {
                             //根据mesPartPtr的目标零件号，找到零件信息
                             String destPartNo = mesPartPtr.getDestPartNo();
@@ -325,11 +336,21 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                         }
                     }
                 }
+            }
             List<String> partNoList = workOrderPartList.stream().map(MesWorkOrderPart::getPartNo).collect(Collectors.toList());
             List<MesPartPtr> partPtrList = getPartPtrList(organizeCode, mesWorkOrder.getWorkCenterCode(), partNoList);
             //装配件规则如果进行了零件替换 则使用ptr的规则 key 零件号，value 是规则
-
+            long count = partPtrList.stream().filter(item -> item.getIsInterPrt() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()).count();
+            if (count > 0){
+                isFOrder = true;
+            }
             for (MesPartPtr mesPartPtr : partPtrList) {
+                //查询ptr总成
+                DdlPackBean detailPartPtr = DdlPackBean.getDdlPackBean(organizeCode);
+                DdlPreparedPack.getNumEqualPack(mesPartPtr.getId(),"ptrId",detailPartPtr);
+                DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(),"partNo",detailPartPtr);
+                int detailPtrPartCount = partPtrDetailRao.findByHqlWhereCount(detailPartPtr);
+                if (detailPtrPartCount > 0){
                     //根据mesPartPtr的目标零件号，找到零件信息
                     String destPartNo = mesPartPtr.getDestPartNo();
                     String srcPartNo = mesPartPtr.getSrcPartNo();
@@ -362,13 +383,18 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                     }
                 }
             }
+        }
 
         //  生成装配件清单
+        if (!isFOrder){
             if (isModifyPOrder){
                 mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue());
             }else {
                 mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue());
             }
+        }else {
+            mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.F.getValue());
+        }
         /**
          * 工单号修改
          * {ORG}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo}