新增webcad生产单导入：es boardData新增info

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java

@@ -179,46 +179,7 @@ public class WebCadDataBlockReqVO {
         @JsonProperty("isReverse")
         private Boolean isReverse;
 
-        @NoArgsConstructor
+        private Object info;
-        @Data
-        public static class InfoDTO {
-            @JsonProperty("id")
-            private Integer id;
-            @JsonProperty("name")
-            private String name;
-            @JsonProperty("roomName")
-            private String roomName;
-            @JsonProperty("cabinetName")
-            private String cabinetName;
-            @JsonProperty("material")
-            private String material;
-            @JsonProperty("boardName")
-            private String boardName;
-            @JsonProperty("color")
-            private String color;
-            @JsonProperty("lines")
-            private Integer lines;
-            @JsonProperty("drillType")
-            private String drillType;
-            @JsonProperty("thickness")
-            private Integer thickness;
-            @JsonProperty("spliteHeight")
-            private String spliteHeight;
-            @JsonProperty("spliteThickness")
-            private String spliteThickness;
-            @JsonProperty("spliteWidth")
-            private String spliteWidth;
-            @JsonProperty("isRect")
-            private Boolean isRect;
-            @JsonProperty("remarks")
-            private List<List<String>> remarks;
-            @JsonProperty("kaiLiaoWidth")
-            private Double kaiLiaoWidth;
-            @JsonProperty("kaiLiaoHeight")
-            private Double kaiLiaoHeight;
-            @JsonProperty("openDir")
-            private Integer openDir;
-        }
 
         @NoArgsConstructor
         @Data

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java

@@ -578,8 +578,11 @@ public class WebCadOrderImportFactory {
         // 生成自定义板编号
         generateCustomPlateNo(plateDO);
 
+        WebCadDataBlockReqVO.BoadrData boardData = block.getBoardData();
+        boardData.setInfo(blockInfo);
         // 获取封边厚度
-        calculateSealThickness(plateDO, block.getBoardData().getSealing());
+        calculateSealThickness(plateDO, boardData.getSealing());
+
 
         //批量保存板件
         plateDOS.add(plateDO);
@@ -588,7 +591,7 @@ public class WebCadOrderImportFactory {
         OrderModelDO orderModelDO = OrderModelDO.builder()
                 .orderId(orderId)
                 .plateId(plateId)
-                .boardData(JSON.toJSONString(block.getBoardData()))
+                .boardData(JSON.toJSONString(boardData))
                 .pointInfo(JSON.toJSONString(block.getPointInfo()))
                 .build();
         orderModelDO.setGoodsId(block.getGoodsId());