Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增webcad生产单导入：es orderModel新增cad字段pointInfo

Browse Source
This commit is contained in:
gaoqr
2025-03-13 18:37:45 +08:00
parent 6fc8605073
commit 6715324411
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
+3
View File
@@ -117,4 +117,7 @@ public class OrderModelDO extends ESDocument {
@Schema(description = "webcad板材数据") @Schema(description = "webcad板材数据")
private String boardData; private String boardData;
@Schema(description = "webcad点阵数据")
private String pointInfo;
} }
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java
+1
View File
@@ -56,6 +56,7 @@ public class WebCadDataBlockReqVO {
private Double cabinetWidth; private Double cabinetWidth;
private Double cabinetHeight; private Double cabinetHeight;
private BoadrData boardData; private BoadrData boardData;
private Object pointInfo;
private Long plateGoodsId; private Long plateGoodsId;
private String goodsId; private String goodsId;
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java
+3
View File
@@ -121,4 +121,7 @@ public class OrderModelDO extends ESDocument {
@Schema(description = "webcad板材数据") @Schema(description = "webcad板材数据")
private String boardData; private String boardData;
@Schema(description = "webcad点阵数据")
private String pointInfo;
} }
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+1
View File
@@ -589,6 +589,7 @@ public class WebCadOrderImportFactory {
.orderId(orderId) .orderId(orderId)
.plateId(plateId) .plateId(plateId)
.boardData(JSON.toJSONString(block.getBoardData())) .boardData(JSON.toJSONString(block.getBoardData()))
.pointInfo(JSON.toJSONString(block.getPointInfo()))
.build(); .build();
orderModelDO.setGoodsId(block.getGoodsId()); orderModelDO.setGoodsId(block.getGoodsId());
orderModelDO.setPlateGoodsId(plateDO.getGoodsId()); orderModelDO.setPlateGoodsId(plateDO.getGoodsId());