From 6549fad476062688d5ecf2f3804e8ff16c3d7b96 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 4 Jul 2025 16:00:44 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=AD=A3=E9=9D=A2=E5=AD=A4=E5=B2=9B=E9=80=A0=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/WebCadOrderImportAsyncFactory.java | 8 +++++--- .../orderImport/factory/WebCadOrderImportFactory.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 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 24f2f7011..213e06d86 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 @@ -1107,6 +1107,8 @@ public class WebCadOrderImportAsyncFactory { WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline = cadOriginModeling.getOutline(); originModelingData.setOutline(getOriginModelingOutlineList(cadOutline)); + originModelingData.setHoles(getModelingHoles(cadOriginModeling.getHoles())); + modelDetail.setOriginModeling(originModelingData); } List pointList = cadModelDetail.getPointList(); @@ -1234,7 +1236,7 @@ public class WebCadOrderImportAsyncFactory { originModelingData.setOutline(getOriginModelingOutlineList(cadSideOriginModeling.getOutline())); - originModelingData.setHoles(getSideModelingHoles(cadSideOriginModeling.getHoles())); + originModelingData.setHoles(getModelingHoles(cadSideOriginModeling.getHoles())); modelDetail.setOriginModeling(originModelingData); } @@ -1250,12 +1252,12 @@ public class WebCadOrderImportAsyncFactory { } /** - * 获取侧面孤岛造型 + * 获取孤岛造型 * * @param cadSideHoles * @return */ - private List> getSideModelingHoles(List cadSideHoles) { + private List> getModelingHoles(List cadSideHoles) { if (CollUtil.isNotEmpty(cadSideHoles)) { List> icontourDataList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) { 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 c847721b0..284c2e8c3 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 @@ -930,6 +930,8 @@ public class WebCadOrderImportFactory { WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline = cadOriginModeling.getOutline(); originModelingData.setOutline(getOriginModelingOutlineList(cadOutline)); + originModelingData.setHoles(getModelingHoles(cadOriginModeling.getHoles())); + modelDetail.setOriginModeling(originModelingData); } List pointList = cadModelDetail.getPointList(); @@ -1057,7 +1059,7 @@ public class WebCadOrderImportFactory { originModelingData.setOutline(getOriginModelingOutlineList(cadSideOriginModeling.getOutline())); - originModelingData.setHoles(getSideModelingHoles(cadSideOriginModeling.getHoles())); + originModelingData.setHoles(getModelingHoles(cadSideOriginModeling.getHoles())); modelDetail.setOriginModeling(originModelingData); } @@ -1073,12 +1075,12 @@ public class WebCadOrderImportFactory { } /** - * 获取侧面孤岛造型 + * 获取孤岛造型 * * @param cadSideHoles * @return */ - private List> getSideModelingHoles(List cadSideHoles) { + private List> getModelingHoles(List cadSideHoles) { if (CollUtil.isNotEmpty(cadSideHoles)) { List> icontourDataList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) {