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); }