Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

webcad拆单更新自定义版编号feign请求置于事务最后

Browse Source
This commit is contained in:
gaoqr
2025-05-19 17:25:14 +08:00
parent 164a0a1857
commit 5e736bd1c6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+3 -2
View File
@@ -288,6 +288,9 @@ public class WebCadOrderImportAsyncFactory {
// 更新导入任务为成功 // 更新导入任务为成功
updateTaskSuccess(taskId); updateTaskSuccess(taskId);
// 所有自定义板编号生成完成后更新配置到生产单
customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
} catch (Exception e) { } catch (Exception e) {
if (esInsert) { if (esInsert) {
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
@@ -583,8 +586,6 @@ public class WebCadOrderImportAsyncFactory {
} }
reader.endArray(); reader.endArray();
orderPlateBatchInsertWithinThreshold(plateDOS, true); orderPlateBatchInsertWithinThreshold(plateDOS, true);
// 所有自定义板编号生成完成后更新配置到生产单
customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
// 批量插入造型数据 // 批量插入造型数据
orderModelsBatchInsertWithinThreshold(true); orderModelsBatchInsertWithinThreshold(true);
} }
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+3 -2
View File
@@ -245,6 +245,9 @@ public class WebCadOrderImportFactory {
saveData(); saveData();
log.debug("====================【cad拆单全局保存结束】===================="); log.debug("====================【cad拆单全局保存结束】====================");
// 所有自定义板编号生成完成后更新配置到生产单
customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
if (plateNumReachThreshold) { if (plateNumReachThreshold) {
log.warn(ServiceExceptionUtil.exception(WEBCAD_ORDER_IMPORT_ORDER_PLATENUM_REACH_THRESHOLD_ERROR, orderId, cadImportPlateNumThreshold).getMessage()); 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); orderPlateBatchInsertWithinThreshold(plateDOS, true);
// 所有自定义板编号生成完成后更新配置到生产单
customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
// 批量插入造型数据 // 批量插入造型数据
orderModelsBatchInsertWithinThreshold(true); orderModelsBatchInsertWithinThreshold(true);
} }