From df68ae5c0908f6d831752633524f76b1dc0c51ac Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Tue, 24 Sep 2024 20:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E5=B7=A5=E5=8D=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=98=9F=E5=88=97=E5=92=8C=E5=BA=8F=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/roundness/MesPackageRoundnessService.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
index 6714421..093206f 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
+++ b/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