cad三维看图能力相关字段修复

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderBodyViewPlatePageRespVO.java

@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class OrderBodyViewPlatePageRespVO {
     @Schema(description = "板件编号")
-    private Long id;
+    private String plateNo;
 
     @Schema(description = "板件名称")
     private String name;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java

@@ -13,9 +13,9 @@ import java.math.BigDecimal;
 @Data
 public class OrderBodyViewPlatesPageDO {
     /**
-     * 主键
+     * 板编号
      */
-    private Long id;
+    private String plateNo;
 
     /**
      * 板件名称

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml

@@ -535,9 +535,9 @@
     </select>
 
     <select id="selectBodyViewPlatesPage" resultType="com.cf.imes.module.executor.dal.dataobject.orderItem.OrderBodyViewPlatesPageDO">
-        SELECT p.id, p.name, p.width, p.height, p.thickness, p.cad_view_id, g.material, g.color
+        SELECT p.plate_no, p.name, p.width, p.height, p.thickness, g.material, g.color, p.cad_plate_no as customNumber
         <if test="cadView">
-        , p.cad_plate_no as customNumber, p.seal_left, p.seal_down, p.seal_right, p.seal_up
+        , p.cad_view_id, p.seal_left, p.seal_down, p.seal_right, p.seal_up
         </if>
         FROM order_item i
         LEFT JOIN `order_plate` p ON i.plate_id = p.id

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

@@ -93,9 +93,6 @@ public class WebCadDataBlockReqVO {
 //    private Long plateGoodsId;
     private String goodsCode;
 
-    @JsonProperty(value = "CadData")
-    private String CadData;
-
     private List<Integer> groupIds = new ArrayList<>();
 
     public void setIsSpecialShape(boolean specialShape) {

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

@@ -858,7 +858,6 @@ public class WebCadOrderImportAsyncFactory {
                 .organId(organId)
                 .planId(0L)
                 .cadViewId(block.getID())
-                .cadData(StringUtils.isNotEmpty(block.getCadData()) ? zipString(block.getCadData()) : null)
                 .build();
         plateDO.setCreator(operatorName);
         plateDO.setUpdater(operatorName);
@@ -1852,7 +1851,7 @@ public class WebCadOrderImportAsyncFactory {
     private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) {
         // 达到批量的阈值就做一次插入
         if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || isLast)) {
-            String sql = "INSERT INTO order_plate  (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_view_id, cad_data, cad_plate_no) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            String sql = "INSERT INTO order_plate  (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_view_id, cad_plate_no) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
             jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1908,7 +1907,7 @@ public class WebCadOrderImportAsyncFactory {
                     ps.setString(49, item.getCreator());
                     ps.setString(50, item.getUpdater());
                     ps.setInt(51, item.getCadViewId());
-                    ps.setString(52, item.getCadData());
+                    ps.setString(52, item.getCadPlateNo());
                 }
 
                 @Override

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

@@ -715,7 +715,6 @@ public class WebCadOrderImportFactory {
                 .organId(organId)
                 .planId(0L)
                 .cadViewId(block.getID())
-                .cadData(StringUtils.isNotEmpty(block.getCadData()) ? zipString(block.getCadData()) : null)
                 .build();
         plateDO.setCreator(operatorName);
         plateDO.setUpdater(operatorName);
@@ -1704,7 +1703,7 @@ public class WebCadOrderImportFactory {
     private void orderPlateBatchInsertWithinThreshold(List<PlateDO> list, boolean isLast) {
         // 达到批量的阈值就做一次插入
         if (CollUtil.isNotEmpty(list) && (list.size() >= BATCH_THRESHOLD_NUMBER || isLast)) {
-            String sql = "INSERT INTO order_plate  (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_view_id, cad_data, cad_plate_no) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            String sql = "INSERT INTO order_plate  (id,organ_id,order_id,name,plate_no,type,goods_id,width,height,thickness,split_width,split_height,split_thickness,seal_left,seal_right,seal_up,seal_down,area,texture,hole_face,hole_arrange,unregular_point_count,front_hole_count,back_hole_count,side_hole_count,front_model_count,back_model_count,is_door,open_door_type,offset_x,offset_y,is_arc_across,module_type_id,is_special_shaped,is_sculpt,is_side_sculpt,is_2v,is_side_2v,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater, cad_view_id, cad_plate_no) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
             jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1760,8 +1759,7 @@ public class WebCadOrderImportFactory {
                     ps.setString(49, item.getCreator());
                     ps.setString(50, item.getUpdater());
                     ps.setInt(51, item.getCadViewId());
-                    ps.setString(52, item.getCadData());
+                    ps.setString(52, item.getCadPlateNo());
-                    ps.setString(53, item.getCadPlateNo());
                 }
 
                 @Override