武汉工单调整代码顺序

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

@@ -415,8 +415,6 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
 
 
         //  生成装配件清单
-        List<MesWorkOrderAssembly> assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup);
-        ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
         if (isModifyPOrder){
             mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P_SORT.getValue());
         }else {
@@ -442,6 +440,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             }
             workOrderPartRao.saveAll(workOrderPartList);
         }
+        List<MesWorkOrderAssembly> assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup);
         /**
          * 生产序号
          * 工厂-产线-9位流水号,跳号10
@@ -452,6 +451,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<String> proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
         String proSeqStr = proSeqResultList.get(0);
         mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace(organizeCode, "").replace(mesWorkOrder.getWorkCenterCode(),"")));
+        ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
         mesWorkOrderRao.insert(mesWorkOrder);