From ed49597be119c7139271abb2623b85fa12400f0d Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 16 May 2025 10:09:55 +0800
Subject: [PATCH] =?UTF-8?q?cad=E6=8B=86=E5=8D=95order=5Fplate=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E5=88=80=E8=B7=AF=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/order/OrderPlatesDetailReqVO.java      |  8 ++---
 .../admin/plate/vo/PlateRespVO.java           | 10 +++---
 .../mapper/orderItem/OrderItemMapper.xml      |  2 +-
 .../plan/dal/dataobject/plate/PlateDO.java    |  4 +--
 .../WebCadOrderImportAsyncFactory.java        | 33 ++++++++++---------
 .../factory/WebCadOrderImportFactory.java     | 10 +++---
 6 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java
index 61f25c8a5..c42e45454 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPlatesDetailReqVO.java
@@ -60,17 +60,17 @@ public class OrderPlatesDetailReqVO {
     @Schema(description = "是否异形", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean isSpecialShaped;
 
-    @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean isSculpt;
 
     @Schema(description = "是否侧面造型")
-    private boolean isSideSculpt;
+    private Boolean isSideSculpt;
 
     @Schema(description = "是否二维刀路")
-    private boolean has2DModel;
+    private Boolean is2v;
 
     @Schema(description = "是否侧面二维刀路")
-    private boolean hasSide2DModel;
+    private Boolean isSide2v;
 
     @Schema(description = "是否排孔", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean isRowHole;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java
index 8aefdfda6..91c4c3731 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java
@@ -156,18 +156,18 @@ public class PlateRespVO extends PageParam {
     @ExcelProperty("是否异形")
     private Boolean isSpecialShaped;
 
-    @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("是否造型")
+    @Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否正反面造型")
     private Boolean isSculpt;
 
     @Schema(description = "是否侧面造型")
-    private boolean isSideSculpt;
+    private Boolean isSideSculpt;
 
     @Schema(description = "是否二维刀路")
-    private boolean has2DModel;
+    private Boolean is2v;
 
     @Schema(description = "是否侧面二维刀路")
-    private boolean hasSide2DModel;
+    private Boolean isSide2v;
 
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @ExcelProperty("备注")
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
index c17a864c5..861165c3b 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
@@ -5,7 +5,7 @@
 
     <select id="selectPlatesDetailByOrderId" resultType="com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO">
         SELECT DISTINCT i.order_id, p.id, p.plate_no, g.material, p.name, p.area, p.seal_left, p.seal_down,
-        p.seal_right, p.seal_up, p.texture, p.is_special_shaped, p.is_sculpt,p.is_side_sculpt,p.has_2d_model, p.has_side_2d_model, p.unregular_point_count, p.front_hole_count,
+        p.seal_right, p.seal_up, p.texture, p.is_special_shaped, p.is_sculpt,p.is_side_sculpt,p.is_2v, p.is_side_2v, p.unregular_point_count, p.front_hole_count,
         p.back_hole_count, p.side_hole_count,p.width,p.height,p.thickness,p.remark,g.color,p.is_row_hole, p.custom_plate_no
         FROM order_item i
         RIGHT JOIN `order_plate` p ON i.plate_id = p.id
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java
index 2ed5ee19a..20a80c4ac 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/plate/PlateDO.java
@@ -233,12 +233,12 @@ public class PlateDO extends BaseDO {
     /**
      * 是否二维刀路
      */
-    private Boolean has2DModel;
+    private Boolean is2v;
 
     /**
      * 是否侧面二维刀路
      */
-    private Boolean hasSide2DModel;
+    private Boolean isSide2v;
     /**
      * 是否造型
      */
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 c5050eee8..7708a2a2a 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
@@ -721,8 +721,8 @@ public class WebCadOrderImportAsyncFactory {
                 .isSpecialShaped(isSpecialShape)
                 .isSculpt(isModel)
                 .isSideSculpt(sideModel)
-                .has2DModel(has2DModel)
-                .hasSide2DModel(hasSide2DModel)
+                .is2v(has2DModel)
+                .isSide2v(hasSide2DModel)
                 .isRowHole(isRawHole)
                 .customPlateNoBuilder(new StringBuilder())
                 .holeArrange(block.getHoleArrange())
@@ -1716,7 +1716,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_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater) 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) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
             jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1756,18 +1756,21 @@ public class WebCadOrderImportAsyncFactory {
                     ps.setLong(33, item.getModuleTypeId());
                     ps.setBoolean(34, item.getIsSpecialShaped());
                     ps.setBoolean(35, item.getIsSculpt());
-                    ps.setBoolean(36, item.getIsRowHole());
-                    ps.setBoolean(37, item.getIsOptimized());
-                    ps.setInt(38, item.getIsCutted());
-                    ps.setString(39, item.getFilterType());
-                    ps.setString(40, item.getRemark());
-                    ps.setBoolean(41, item.getIsCancel());
-                    ps.setBoolean(42, item.getDeleted());
-                    ps.setString(43, item.getCustomPlateNo());
-                    ps.setTimestamp(44, Timestamp.valueOf(item.getCreateTime()));
-                    ps.setTimestamp(45, Timestamp.valueOf(item.getUpdateTime()));
-                    ps.setString(46, item.getCreator());
-                    ps.setString(47, item.getUpdater());
+                    ps.setBoolean(36, item.getIsSideSculpt());
+                    ps.setBoolean(37, item.getIs2v());
+                    ps.setBoolean(38, item.getIsSide2v());
+                    ps.setBoolean(39, item.getIsRowHole());
+                    ps.setBoolean(40, item.getIsOptimized());
+                    ps.setInt(41, item.getIsCutted());
+                    ps.setString(42, item.getFilterType());
+                    ps.setString(43, item.getRemark());
+                    ps.setBoolean(44, item.getIsCancel());
+                    ps.setBoolean(45, item.getDeleted());
+                    ps.setString(46, item.getCustomPlateNo());
+                    ps.setTimestamp(47, Timestamp.valueOf(item.getCreateTime()));
+                    ps.setTimestamp(48, Timestamp.valueOf(item.getUpdateTime()));
+                    ps.setString(49, item.getCreator());
+                    ps.setString(50, item.getUpdater());
                 }
 
                 @Override
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 8b83f5a39..b8a4183fe 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
@@ -625,8 +625,8 @@ public class WebCadOrderImportFactory {
                 .isSpecialShaped(isSpecialShape)
                 .isSculpt(isModel)
                 .isSideSculpt(sideModel)
-                .has2DModel(has2DModel)
-                .hasSide2DModel(hasSide2DModel)
+                .is2v(has2DModel)
+                .isSide2v(hasSide2DModel)
                 .isRowHole(isRawHole)
                 .customPlateNoBuilder(new StringBuilder())
                 .holeArrange(block.getHoleArrange())
@@ -1617,7 +1617,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,has_2d_model,has_side_2d_model,is_row_hole,is_optimized,is_cutted,filter_type,remark,is_cancel,deleted,custom_plate_no,create_time,update_time,creator,updater) 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) VALUES    (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
             jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int index) throws SQLException {
@@ -1658,8 +1658,8 @@ public class WebCadOrderImportFactory {
                     ps.setBoolean(34, item.getIsSpecialShaped());
                     ps.setBoolean(35, item.getIsSculpt());
                     ps.setBoolean(36, item.getIsSideSculpt());
-                    ps.setBoolean(37, item.getHas2DModel());
-                    ps.setBoolean(38, item.getHasSide2DModel());
+                    ps.setBoolean(37, item.getIs2v());
+                    ps.setBoolean(38, item.getIsSide2v());
                     ps.setBoolean(39, item.getIsRowHole());
                     ps.setBoolean(40, item.getIsOptimized());
                     ps.setInt(41, item.getIsCutted());