From 3987d86200146f797d9c59f840b8be5ff37cb3ce Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 15 Jun 2026 09:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E4=BB=B6=E4=BF=A1=E6=81=AF=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85=E3=80=81=E9=A2=84?=
 =?UTF-8?q?=E7=95=99=E8=BE=B9=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/pack/vo/PlateDetailsRespVO.java    |  2 +-
 .../admin/plan/vo/PlateDetailRespVO.java      | 11 +++
 .../plate/vo/OrderViewPlatePageRespVO.java    | 12 +++
 .../orderItem/OrdersViewPlatesPageDO.java     | 20 ++++
 .../dal/dataobject/plate/PlateDetailDO.java   | 20 ++++
 .../resources/mapper/plate/PlateMapper.xml    | 97 ++++++++++---------
 6 files changed, 114 insertions(+), 48 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java
index 8eac9652d..cc8396a0f 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java
@@ -84,7 +84,7 @@ public class PlateDetailsRespVO {
 
     @Schema(description = "异形")
     @ExcelProperty("异形")
-    private Boolean specialShaped;
+    private Boolean isSpecialShaped;
 
     @Schema(description = "正反面造型")
     @ExcelProperty("正反面造型")
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
index b5f66d585..33b36fb0e 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
@@ -108,6 +108,17 @@ public class PlateDetailRespVO {
     @Schema(description = "下封边厚度", requiredMode = Schema.RequiredMode.REQUIRED)
     private BigDecimal sealDown;
 
+    @Schema(description = "左预留边")
+    private BigDecimal reservedEdgeLeft;
+
+    @Schema(description = "右预留边")
+    private BigDecimal reservedEdgeRight;
+
+    @Schema(description = "上预留边")
+    private BigDecimal reservedEdgeUp;
+
+    @Schema(description = "下预留边")
+    private BigDecimal reservedEdgeDown;
 
     @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED)
     private BigDecimal area;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderViewPlatePageRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderViewPlatePageRespVO.java
index 5bd173a63..c2b6317db 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderViewPlatePageRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderViewPlatePageRespVO.java
@@ -73,6 +73,18 @@ public class OrderViewPlatePageRespVO {
     @Schema(description = "下封边厚度")
     private BigDecimal sealDown;
 
+    @Schema(description = "左预留边")
+    private BigDecimal reservedEdgeLeft;
+
+    @Schema(description = "右预留边")
+    private BigDecimal reservedEdgeRight;
+
+    @Schema(description = "上预留边")
+    private BigDecimal reservedEdgeUp;
+
+    @Schema(description = "下预留边")
+    private BigDecimal reservedEdgeDown;
+
     @Schema(description = "材质")
     private String material;
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrdersViewPlatesPageDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrdersViewPlatesPageDO.java
index 7cf4e2483..cc859b587 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrdersViewPlatesPageDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrdersViewPlatesPageDO.java
@@ -92,6 +92,26 @@ public class OrdersViewPlatesPageDO {
      */
     private BigDecimal sealDown;
 
+    /**
+     * 左预留边
+     */
+    private BigDecimal reservedEdgeLeft;
+
+    /**
+     * 右预留边
+     */
+    private BigDecimal reservedEdgeRight;
+
+    /**
+     * 上预留边
+     */
+    private BigDecimal reservedEdgeUp;
+
+    /**
+     * 下预留边
+     */
+    private BigDecimal reservedEdgeDown;
+
     /**
      * 材质
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
index 497fa9c2a..041dbe7b7 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
@@ -148,6 +148,26 @@ public class PlateDetailDO {
      */
     private BigDecimal sealDown;
 
+    /**
+     * 左预留边
+     */
+    private BigDecimal reservedEdgeLeft;
+
+    /**
+     * 右预留边
+     */
+    private BigDecimal reservedEdgeRight;
+
+    /**
+     * 上预留边
+     */
+    private BigDecimal reservedEdgeUp;
+
+    /**
+     * 下预留边
+     */
+    private BigDecimal reservedEdgeDown;
+
     /**
      * 面积
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index 8a171835f..3ad45ea65 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -460,6 +460,10 @@
         op.seal_right as sealRight,
         op.seal_up as sealUp,
         op.seal_down as sealDown,
+        op.reserved_edge_left AS reservedEdgeLeft,
+        op.reserved_edge_right AS reservedEdgeRight,
+        op.reserved_edge_up AS reservedEdgeUp,
+        op.reserved_edge_down AS reservedEdgeDown,
         op.area as area,
         op.texture as texture,
         op.hole_face as holeFace,
@@ -572,6 +576,10 @@
         op.seal_right as sealRight,
         op.seal_up as sealUp,
         op.seal_down as sealDown,
+        op.reserved_edge_left AS reservedEdgeLeft,
+        op.reserved_edge_right AS reservedEdgeRight,
+        op.reserved_edge_up AS reservedEdgeUp,
+        op.reserved_edge_down AS reservedEdgeDown,
         op.area as area,
         op.texture as texture,
         op.hole_face as holeFace,
@@ -1039,7 +1047,7 @@
         <result property="thickness" column="plateThickness"/>
         <result property="area" column="plateArea"/>
         <result property="texture" column="texture"/>
-        <result property="specialShaped" column="specialShaped"/>
+        <result property="isSpecialShaped" column="isSpecialShaped"/>
         <result property="isSculpt" column="isSculpt"/>
         <result property="isRowHole" column="isRowHole"/>
         <result property="remark" column="remark"/>
@@ -1113,7 +1121,6 @@
 
 
     <select id="selectOrdersPackPlateList"
-            parameterType="java.lang.Long"
             resultMap="PlateDetailsMap">
         SELECT
         og.name            AS processGroup,
@@ -1142,22 +1149,18 @@
         op.texture,
         op.remark,
 
-        op.is_special_shaped AS specialShaped,
-        op.is_sculpt         AS isSculpt,
-        op.is_row_hole       AS isRowHole,
-        op.front_hole_count  AS frontHoleCount,
-        op.back_hole_count   AS backHoleCount,
-        op.side_hole_count   AS sideHoleCount,
-        op.open_door_type    AS openDoorType,
-        op.is_side_sculpt    AS isSideSculpt,
-        op.is_2v             AS is2v,
-        op.is_side_2v        AS isSide2v,
-        op.split_width       AS splitWidth,
-        op.split_height      AS splitHeight,
+        op.hole_face as holeFace,
+        op.hole_arrange as holeArrange,
+        op.open_door_type as openDoorType,
+        op.split_width as splitWidth,
+        op.split_height as splitHeight,
         op.seal_left         AS sealLeft,
         op.seal_right        AS sealRight,
         op.seal_up           AS sealUp,
-        op.seal_down         AS sealDown
+        op.seal_down         AS sealDown,
+        op.is_sculpt         AS isSculpt,
+        CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
+        op.is_row_hole       AS isRowHole
 
         FROM order_plate op
 
@@ -1233,22 +1236,18 @@
         op.texture,
         op.remark,
 
-        op.is_special_shaped  AS specialShaped,
-        op.is_sculpt          AS isSculpt,
-        op.is_row_hole        AS isRowHole,
-        op.front_hole_count   AS frontHoleCount,
-        op.back_hole_count    AS backHoleCount,
-        op.side_hole_count    AS sideHoleCount,
-        op.open_door_type     AS openDoorType,
-        op.is_side_sculpt     AS isSideSculpt,
-        op.is_2v              AS is2v,
-        op.is_side_2v         AS isSide2v,
-        op.split_width        AS splitWidth,
-        op.split_height       AS splitHeight,
-        op.seal_left          AS sealLeft,
-        op.seal_right         AS sealRight,
-        op.seal_up            AS sealUp,
-        op.seal_down          AS sealDown
+        op.hole_face as holeFace,
+        op.hole_arrange as holeArrange,
+        op.open_door_type as openDoorType,
+        op.split_width as splitWidth,
+        op.split_height as splitHeight,
+        op.seal_left         AS sealLeft,
+        op.seal_right        AS sealRight,
+        op.seal_up           AS sealUp,
+        op.seal_down         AS sealDown,
+        CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
+        op.is_sculpt         AS isSculpt,
+        op.is_row_hole       AS isRowHole
 
         FROM order_item oi
 
@@ -1323,22 +1322,18 @@
         op.texture,
         op.remark,
 
-        op.is_special_shaped  AS specialShaped,
-        op.is_sculpt          AS profiling,
-        op.is_row_hole        AS rowHole,
-        op.front_hole_count   AS frontHoleCount,
-        op.back_hole_count    AS backHoleCount,
-        op.side_hole_count    AS sideHoleCount,
-        op.open_door_type     AS openDoorType,
-        op.is_side_sculpt     AS isSideSculpt,
-        op.is_2v              AS is2v,
-        op.is_side_2v         AS isSide2v,
-        op.split_width        AS splitWidth,
-        op.split_height       AS splitHeight,
-        op.seal_left          AS sealLeft,
-        op.seal_right         AS sealRight,
-        op.seal_up            AS sealUp,
-        op.seal_down          AS sealDown
+        op.hole_face as holeFace,
+        op.hole_arrange as holeArrange,
+        op.open_door_type as openDoorType,
+        op.split_width as splitWidth,
+        op.split_height as splitHeight,
+        op.seal_left         AS sealLeft,
+        op.seal_right        AS sealRight,
+        op.seal_up           AS sealUp,
+        op.seal_down         AS sealDown,
+        CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
+        op.is_sculpt         AS isSculpt,
+        op.is_row_hole       AS isRowHole
 
         FROM order_item oi
 
@@ -1506,6 +1501,10 @@
         p.seal_down,
         p.seal_right,
         p.seal_up,
+        p.reserved_edge_left AS reservedEdgeLeft,
+        p.reserved_edge_right AS reservedEdgeRight,
+        p.reserved_edge_up AS reservedEdgeUp,
+        p.reserved_edge_down AS reservedEdgeDown,
         p.area,
         p.texture,
         (p.unregular_point_count > 0 ) AS isSpecialShaped,
@@ -1639,6 +1638,10 @@
         p.seal_down,
         p.seal_right,
         p.seal_up,
+        p.reserved_edge_left AS reservedEdgeLeft,
+        p.reserved_edge_right AS reservedEdgeRight,
+        p.reserved_edge_up AS reservedEdgeUp,
+        p.reserved_edge_down AS reservedEdgeDown,
         p.area,
         p.texture,
         (p.unregular_point_count > 0 ) AS isSpecialShaped,