From e0bfeb6567c022f653d137842ac8f3d1d7ecb385 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 21 May 2025 18:13:48 +0800
Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=AD=94=E3=80=81=E9=80=A0=E5=9E=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/factory/WebCadOrderImportAsyncFactory.java     | 3 +++
 .../service/orderImport/factory/WebCadOrderImportFactory.java  | 3 +++
 2 files changed, 6 insertions(+)

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 a01252674..f24ab31b4 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
@@ -950,6 +950,7 @@ public class WebCadOrderImportAsyncFactory {
         if (CollUtil.isNotEmpty(cadPointDetailList)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.PointDetailDTO cadPointDetail : cadPointDetailList) {
                 PointDetail pointDetail = new PointDetail();
+                pointDetail.setId(String.valueOf(cadPointDetail.getPointID()));
                 pointDetail.setPointX(cadPointDetail.getPointX());
                 pointDetail.setPointY(cadPointDetail.getPointY());
                 pointDetail.setCurve(cadPointDetail.getCurve());
@@ -970,6 +971,7 @@ public class WebCadOrderImportAsyncFactory {
         if (CollUtil.isNotEmpty(orgPointDetail)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.OrgPointDetailDTO cadPointDetail : orgPointDetail) {
                 PointDetail pointDetail = new PointDetail();
+                pointDetail.setId(String.valueOf(cadPointDetail.getPointID()));
                 pointDetail.setPointX(cadPointDetail.getPointX());
                 pointDetail.setPointY(cadPointDetail.getPointY());
                 pointDetail.setCurve(cadPointDetail.getCurve());
@@ -1016,6 +1018,7 @@ public class WebCadOrderImportAsyncFactory {
         if (CollUtil.isNotEmpty(cadSideHoleDetailList)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.SideHoleDetailDTO cadHoleDetail : cadSideHoleDetailList) {
                 HoleDetail holeDetail = new HoleDetail();
+                holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID()));
                 holeDetail.setFaceType(cadHoleDetail.getFace());
                 holeDetail.setStartX(cadHoleDetail.getPointX());
                 holeDetail.setStartY(cadHoleDetail.getPointY());
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 70275c909..2e8855d36 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
@@ -760,6 +760,7 @@ public class WebCadOrderImportFactory {
         if (CollUtil.isNotEmpty(cadPointDetailList)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.PointDetailDTO cadPointDetail : cadPointDetailList) {
                 PointDetail pointDetail = new PointDetail();
+                pointDetail.setId(String.valueOf(cadPointDetail.getPointID()));
                 pointDetail.setPointX(cadPointDetail.getPointX());
                 pointDetail.setPointY(cadPointDetail.getPointY());
                 pointDetail.setCurve(cadPointDetail.getCurve());
@@ -780,6 +781,7 @@ public class WebCadOrderImportFactory {
         if (CollUtil.isNotEmpty(orgPointDetail)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.OrgPointDetailDTO cadPointDetail : orgPointDetail) {
                 PointDetail pointDetail = new PointDetail();
+                pointDetail.setId(String.valueOf(cadPointDetail.getPointID()));
                 pointDetail.setPointX(cadPointDetail.getPointX());
                 pointDetail.setPointY(cadPointDetail.getPointY());
                 pointDetail.setCurve(cadPointDetail.getCurve());
@@ -826,6 +828,7 @@ public class WebCadOrderImportFactory {
         if (CollUtil.isNotEmpty(cadSideHoleDetailList)) {
             for (WebCadDataBlockReqVO.PointInfoDTO.SideHoleDetailDTO cadHoleDetail : cadSideHoleDetailList) {
                 HoleDetail holeDetail = new HoleDetail();
+                holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID()));
                 holeDetail.setFaceType(cadHoleDetail.getFace());
                 holeDetail.setStartX(cadHoleDetail.getPointX());
                 holeDetail.setStartY(cadHoleDetail.getPointY());