ptr P单优先及开始和结束的GA号

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

@@ -359,6 +359,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
         String ptrInfo = mesWorkOrder.getPtrInfo();
         List<String> custPtrPartList = Arrays.asList(ptrInfo.split("\\|"));
         boolean ptrFlag = false;
+        boolean custFlag = false;
         boolean fOrderFlag = false;
         List<MesWorkOrderAssembly> assemblyList = new ArrayList<>();
         if (!workOrderPartList.isEmpty()) {
@@ -412,10 +413,16 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                 if (!isCust && mesPartPtrDetail == null) {
                     continue;
                 }
-
+                if (isCust){
+                    if (!custFlag){
+                        custFlag = true;
+                    }
+                }
                 ptrFlag = true;
                 if (!isCust && mesPartPtr.getIsInterPrt()==CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
-                    fOrderFlag = true;
+                    if (!fOrderFlag){
+                        fOrderFlag = true;
+                    }
                 }
                 //将工单类零件表替换位PTR条件中维护的替换零件
                 MesPartSap mesPartSap = mesPartSapService.getMesPartSapByPartNo(mesPartPtr.getDestPartNo(), organizeCode);
@@ -424,14 +431,26 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                 //用于打印目视单
                 descriptionStr.append(mesPartPtr.getMemo());
                 //更新mes_part_ptr的实际数量 + 1
-                mesPartPtr.setPrtVehicleActualCount(mesPartPtr.getPrtVehicleActualCount() + 1);
-                ConvertBean.saveOrUpdate(mesPartPtr, "JOB");
-                partPtrRao.update(mesPartPtr);
                 if (mesPartPtrDetail != null) {
+
                     mesPartPtrDetail.setQty(mesPartPtrDetail.getQty() + 1);
                     ConvertBean.saveOrUpdate(mesPartPtrDetail, "JOB");
                     partPtrDetailRao.update(mesPartPtrDetail);
                 }
+                String startGaNo = mesPartPtr.getStartGaNo();
+                if (StringUtils.isBlank(startGaNo)){
+                    mesPartPtr.setStartGaNo(mesWorkOrder.getCustOrderNo());
+                }else {
+                    if (mesWorkOrder.getCustOrderNo().compareTo(startGaNo) < 0){
+                        mesPartPtr.setStartGaNo(mesWorkOrder.getCustOrderNo());
+                        mesPartPtr.setEndGaNo(startGaNo);
+                    }else {
+                        mesPartPtr.setEndGaNo(mesWorkOrder.getCustOrderNo());
+                    }
+                }
+                mesPartPtr.setPrtVehicleActualCount(mesPartPtr.getPrtVehicleActualCount() + 1);
+                ConvertBean.saveOrUpdate(mesPartPtr, "JOB");
+                partPtrRao.update(mesPartPtr);
                 MesWorkOrderAssembly orderAssemblyList = null;
                 for (MesWorkOrderAssembly orderAssembly : assemblyList) {
                     String assemblyPartNo = orderAssembly.getAssemblyPartNo();
@@ -458,7 +477,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             }
 
         }
-        if (ptrFlag && !fOrderFlag){
+        if (ptrFlag && custFlag){
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue());
         }else if (ptrFlag){
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.F.getValue());