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); + } } /**