From 5e736bd1c6893e9061997be12e5e4bdb1cb4604e Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 19 May 2025 17:25:14 +0800
Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=89=88=E7=BC=96=E5=8F=B7feign?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=BD=AE=E4=BA=8E=E4=BA=8B=E5=8A=A1=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/factory/WebCadOrderImportAsyncFactory.java   | 5 +++--
 .../orderImport/factory/WebCadOrderImportFactory.java        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
index 482eb7ad4..9d1ab44a4 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
@@ -288,6 +288,9 @@ public class WebCadOrderImportAsyncFactory {
 
             // 更新导入任务为成功
             updateTaskSuccess(taskId);
+
+            // 所有自定义板编号生成完成后更新配置到生产单
+            customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
         } catch (Exception e) {
             if (esInsert) {
                 CompletableFuture.runAsync(() -> {
@@ -583,8 +586,6 @@ public class WebCadOrderImportAsyncFactory {
         }
         reader.endArray();
         orderPlateBatchInsertWithinThreshold(plateDOS, true);
-        // 所有自定义板编号生成完成后更新配置到生产单
-        customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
         // 批量插入造型数据
         orderModelsBatchInsertWithinThreshold(true);
     }
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index 84e2cf5a6..a3b0e4e3c 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
@@ -245,6 +245,9 @@ public class WebCadOrderImportFactory {
             saveData();
             log.debug("====================【cad拆单全局保存结束】====================");
 
+            // 所有自定义板编号生成完成后更新配置到生产单
+            customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
+
             if (plateNumReachThreshold) {
                 log.warn(ServiceExceptionUtil.exception(WEBCAD_ORDER_IMPORT_ORDER_PLATENUM_REACH_THRESHOLD_ERROR, orderId, cadImportPlateNumThreshold).getMessage());
             }
@@ -510,8 +513,6 @@ public class WebCadOrderImportFactory {
             }
         }
         orderPlateBatchInsertWithinThreshold(plateDOS, true);
-        // 所有自定义板编号生成完成后更新配置到生产单
-        customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
         // 批量插入造型数据
         orderModelsBatchInsertWithinThreshold(true);
     }