武汉工单生成队列和序列号

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java

@@ -413,13 +413,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         }
 
 
-        if (!workOrderPartList.isEmpty()) {
-            for (MesWorkOrderPart orderPart : workOrderPartList) {
-                orderPart.setOrganizeCode(organizeCode);
-                ConvertBean.saveOrUpdate(orderPart, "MES-JOB");
-            }
-            workOrderPartRao.saveAll(workOrderPartList);
-        }
+
         //  生成装配件清单
         List<MesWorkOrderAssembly> assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup);
         ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
@@ -440,6 +434,14 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
         mesWorkOrder.setWorkOrderNo(resultList.get(0));
 
+        if (!workOrderPartList.isEmpty()) {
+            for (MesWorkOrderPart orderPart : workOrderPartList) {
+                orderPart.setOrganizeCode(organizeCode);
+                orderPart.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
+                ConvertBean.saveOrUpdate(orderPart, "MES-JOB");
+            }
+            workOrderPartRao.saveAll(workOrderPartList);
+        }
         /**
          * 生产序号
          * 工厂-产线-9位流水号,跳号10