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 @@
-
+
@@ -1113,7 +1121,6 @@