From b225261d92fb4c8ca6e54e0980e9a01327f28535 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 29 Jun 2026 17:26:37 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=9D=BF=E4=BB=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebCadOrderImportAsyncFactory.java | 23 +++++++++++++++++-- .../factory/WebCadOrderImportFactory.java | 23 +++++++++++++++++-- 2 files changed, 42 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 dfec128a4..1b7036542 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 @@ -942,7 +942,6 @@ public class WebCadOrderImportAsyncFactory { .packageId(0L) .partsId(0L) .num(1.0) - .compId(plateComponentId) .cadViewId(cadViewId) .organId(organId) .build(); @@ -962,13 +961,33 @@ public class WebCadOrderImportAsyncFactory { .packageId(0L) .partsId(0L) .num(1.0) - .compId(plateComponentId) .cadViewId(cadViewId) .organId(organId) .build(); orderItemDOS.add(orderItemDO); orderItemBatchInsertWithinThreshold(orderItemDOS, false); } + + // 创建部件关联关系 + if(ObjectUtil.isNotNull(plateComponentId)) { + OrderItemDO orderItemDO = OrderItemDO + .builder() + .id((Long) snowFlakeGenerator.nextId(null)) + .orderId(orderId) + .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) + .roomId(roomId) + .bodyId(bodyId) + .plateId(plateId) + .packageId(0L) + .partsId(0L) + .num(1.0) + .cadViewId(cadViewId) + .compId(plateComponentId) + .organId(organId) + .build(); + orderItemDOS.add(orderItemDO); + orderItemBatchInsertWithinThreshold(orderItemDOS, false); + } } /** 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 90dac0359..f927f1a67 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 @@ -1552,7 +1552,6 @@ public class WebCadOrderImportFactory { .packageId(0L) .partsId(0L) .num(1.0) - .compId(plateComponentId) .cadViewId(cadViewId) .organId(organId) .build(); @@ -1572,13 +1571,33 @@ public class WebCadOrderImportFactory { .packageId(0L) .partsId(0L) .num(1.0) - .compId(plateComponentId) .cadViewId(cadViewId) .organId(organId) .build(); orderItemDOS.add(orderItemDO); orderItemBatchInsertWithinThreshold(orderItemDOS, false); } + + // 创建部件关联关系 + if(ObjectUtil.isNotNull(plateComponentId)) { + OrderItemDO orderItemDO = OrderItemDO + .builder() + .id((Long) snowFlakeGenerator.nextId(null)) + .orderId(orderId) + .type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) + .roomId(roomId) + .bodyId(bodyId) + .plateId(plateId) + .packageId(0L) + .partsId(0L) + .num(1.0) + .cadViewId(cadViewId) + .compId(plateComponentId) + .organId(organId) + .build(); + orderItemDOS.add(orderItemDO); + orderItemBatchInsertWithinThreshold(orderItemDOS, false); + } } /**