From 671532441195dd5ce03960efba686243ab8d9917 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 13 Mar 2025 18:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9Aes=20orderModel=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Ecad=E5=AD=97=E6=AE=B5pointInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/dal/dataobject/ordermodel/OrderModelDO.java       | 3 +++
 .../admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java      | 1 +
 .../module/plan/dal/dataobject/ordermodel/OrderModelDO.java    | 3 +++
 .../service/orderImport/factory/WebCadOrderImportFactory.java  | 1 +
 4 files changed, 8 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
index c400549ad..4e0885900 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
@@ -117,4 +117,7 @@ public class OrderModelDO extends ESDocument {
 
     @Schema(description = "webcad板材数据")
     private String boardData;
+
+    @Schema(description = "webcad点阵数据")
+    private String pointInfo;
 }
\ No newline at end of file
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/WebCadDataBlockReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java
index 8c422d11c..f0530677e 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java
@@ -56,6 +56,7 @@ public class WebCadDataBlockReqVO {
     private Double cabinetWidth;
     private Double cabinetHeight;
     private BoadrData boardData;
+    private Object pointInfo;
 
     private Long plateGoodsId;
     private String goodsId;
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java
index 42e51440c..c78b7cc79 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java
@@ -121,4 +121,7 @@ public class OrderModelDO extends ESDocument {
 
     @Schema(description = "webcad板材数据")
     private String boardData;
+
+    @Schema(description = "webcad点阵数据")
+    private String pointInfo;
 }
\ No newline at end of file
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 12e52c16f..16fe61c5d 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
@@ -589,6 +589,7 @@ public class WebCadOrderImportFactory {
                 .orderId(orderId)
                 .plateId(plateId)
                 .boardData(JSON.toJSONString(block.getBoardData()))
+                .pointInfo(JSON.toJSONString(block.getPointInfo()))
                 .build();
         orderModelDO.setGoodsId(block.getGoodsId());
         orderModelDO.setPlateGoodsId(plateDO.getGoodsId());