From 69a1bd3e8969cd88d6f292510357a89d897f0e43 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 29 Jun 2026 16:16:46 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=BB=84=E7=B1=BB=E5=9E=8Bid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderimport/webcad/vo/WebCadDataGroupInfoReqVO.java | 1 + .../orderImport/factory/WebCadOrderImportAsyncFactory.java | 6 ++++-- .../orderImport/factory/WebCadOrderImportFactory.java | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataGroupInfoReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataGroupInfoReqVO.java index 5b4dc2ec0..1ccddb7c7 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataGroupInfoReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataGroupInfoReqVO.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; @Data public class WebCadDataGroupInfoReqVO { private String groupTypeName; + private Long groupTypeId; private String groupName; private Double width; private Double height; 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 7f08af2da..dfec128a4 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 @@ -527,6 +527,7 @@ public class WebCadOrderImportAsyncFactory { while (reader.hasNext()) { WebCadDataProcessGroupReqVO processGroup = reader.readObject(WebCadDataProcessGroupReqVO.class); String groupTypeName = processGroup.getType(); + Long groupTypeId = (Long) snowFlakeGenerator.nextId(null); List projects = processGroup.getProjects(); if (CollUtil.isNotEmpty(projects)) { for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) { @@ -534,6 +535,7 @@ public class WebCadOrderImportAsyncFactory { WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO(); processGroupInfo.setGroupName(project.getProjName()); processGroupInfo.setGroupTypeName(groupTypeName); + processGroupInfo.setGroupTypeId(groupTypeId); processGroupInfo.setHeight(project.getBoxSize().getHeight()); processGroupInfo.setWidth(project.getBoxSize().getWidth()); processGroupInfo.setDepth(project.getBoxSize().getDepth()); @@ -904,7 +906,7 @@ public class WebCadOrderImportAsyncFactory { .organId(organId) .orderId(orderId) .bodyId(bodyId) - .groupTypeId((Long) snowFlakeGenerator.nextId(null)) + .groupTypeId(groupInfo.getGroupTypeId()) .groupTypeName(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName()) .width(groupInfo.getWidth()) @@ -1554,7 +1556,7 @@ public class WebCadOrderImportAsyncFactory { .organId(organId) .orderId(orderId) .bodyId(bodyId) - .groupTypeId((Long) snowFlakeGenerator.nextId(null)) + .groupTypeId(groupInfo.getGroupTypeId()) .groupTypeName(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName()) .width(groupInfo.getWidth()) 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 88ffa539d..90dac0359 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 @@ -452,6 +452,7 @@ public class WebCadOrderImportFactory { if (CollUtil.isNotEmpty(processGroupList)) { for (WebCadDataProcessGroupReqVO processGroup : processGroupList) { String groupTypeName = processGroup.getType(); + Long groupTypeId = (Long) snowFlakeGenerator.nextId(null); List projects = processGroup.getProjects(); if (CollUtil.isNotEmpty(projects)) { for (WebCadDataProcessGroupReqVO.ProjectsDTO project : projects) { @@ -459,6 +460,7 @@ public class WebCadOrderImportFactory { WebCadDataGroupInfoReqVO processGroupInfo = new WebCadDataGroupInfoReqVO(); processGroupInfo.setGroupName(project.getProjName()); processGroupInfo.setGroupTypeName(groupTypeName); + processGroupInfo.setGroupTypeId(groupTypeId); processGroupInfo.setHeight(project.getBoxSize().getHeight()); processGroupInfo.setWidth(project.getBoxSize().getWidth()); processGroupInfo.setDepth(project.getBoxSize().getDepth()); @@ -1514,7 +1516,7 @@ public class WebCadOrderImportFactory { .organId(organId) .orderId(orderId) .bodyId(bodyId) - .groupTypeId((Long) snowFlakeGenerator.nextId(null)) + .groupTypeId(groupInfo.getGroupTypeId()) .groupTypeName(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName()) .width(groupInfo.getWidth()) @@ -1740,7 +1742,7 @@ public class WebCadOrderImportFactory { .organId(organId) .orderId(orderId) .bodyId(bodyId) - .groupTypeId((Long) snowFlakeGenerator.nextId(null)) + .groupTypeId(groupInfo.getGroupTypeId()) .groupTypeName(groupInfo.getGroupTypeName()) .name(groupInfo.getGroupTypeName()) .width(groupInfo.getWidth())