From 4faeb9cd78b76cffdfa59cabf321372aad904fad Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Thu, 13 Feb 2025 22:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93Bug=201133=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/admin/pack/vo/PlateDetailsRespVO.java  | 5 +++--
 .../imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
index 780ad44dc..52f654ee3 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
@@ -6,8 +6,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 
@@ -42,6 +40,9 @@ public class PlateDetailsRespVO {
     @Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String plateId;
 
+    @Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String customPlateNo;
+
     @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("板编号")
     private String plateNo;
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml
index f4a983ea2..17ce652fa 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml
@@ -213,6 +213,7 @@
         <result property="plateNo" column="plateNo"/>
         <result property="orderId" column="orderId"/>
         <result property="plateName" column="plateName"/>
+        <result property="customPlateNo" column="customPlateNo"/>
         <result property="material" column="plateMaterial"/>
         <result property="color" column="plateColor"/>
         <result property="width" column="plateWidth"/>
@@ -243,6 +244,7 @@
             op.id as plateId,
             op.plate_no as plateNo,
             op.name as plateName,
+            op.custom_plate_no as customPlateNo,
             ogs.material as plateMaterial,
             ogs.color as plateColor,
             op.order_id as orderId,