From 66278e635b2a64cf4af42feba0baf69e531947c9 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 9 Jun 2026 17:47:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(roll):=20=E6=B7=BB=E5=8A=A0=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=B6=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在MesRollInfo实体类中新增frame字段
- 在MesRollInfoBo业务对象中添加frame字段定义
- 实现机架字段的查询过滤功能
- 在MesRollInfoVo视图对象中增加frame字段映射
- 完成机架数据的Excel导出功能
---
 klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java | 3 +++
 .../main/java/com/klp/mes/roll/domain/bo/MesRollInfoBo.java    | 3 +++
 .../main/java/com/klp/mes/roll/domain/vo/MesRollInfoVo.java    | 3 +++
 .../com/klp/mes/roll/service/impl/MesRollInfoServiceImpl.java  | 1 +
 4 files changed, 10 insertions(+)

diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
index fb9a6345..2cfaf49a 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
@@ -26,6 +26,9 @@ public class MesRollInfo extends BaseEntity {
     /** 产线ID */
     private Long lineId;
 
+    /** 机架 */
+    private String frame;
+
     /** 轧辊编号 */
     private String rollNo;
 
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollInfoBo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollInfoBo.java
index 040912de..9a7f9699 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollInfoBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollInfoBo.java
@@ -25,6 +25,9 @@ public class MesRollInfoBo extends BaseEntity {
     /** 产线ID（查询过滤 / 新增归属） */
     private Long lineId;
 
+    /** 机架 */
+    private String frame;
+
     @NotBlank(message = "轧辊编号不能为空", groups = {AddGroup.class, EditGroup.class})
     private String rollNo;
 
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollInfoVo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollInfoVo.java
index 89c8184c..537b4593 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollInfoVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollInfoVo.java
@@ -25,6 +25,9 @@ public class MesRollInfoVo {
     @ExcelProperty("产线名称")
     private String lineName;
 
+    @ExcelProperty("机架")
+    private String frame;
+
     @ExcelProperty("轧辊编号")
     private String rollNo;
 
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollInfoServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollInfoServiceImpl.java
index 3c412e6d..234c6366 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollInfoServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/service/impl/MesRollInfoServiceImpl.java
@@ -77,6 +77,7 @@ public class MesRollInfoServiceImpl implements IMesRollInfoService {
         lqw.like(StringUtils.isNotBlank(bo.getRollNo()), MesRollInfo::getRollNo, bo.getRollNo());
         lqw.eq(StringUtils.isNotBlank(bo.getRollType()), MesRollInfo::getRollType, bo.getRollType());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MesRollInfo::getStatus, bo.getStatus());
+        lqw.like(StringUtils.isNotBlank(bo.getFrame()), MesRollInfo::getFrame, bo.getFrame());
         lqw.like(StringUtils.isNotBlank(bo.getManufacturer()), MesRollInfo::getManufacturer, bo.getManufacturer());
         lqw.orderByAsc(MesRollInfo::getRollType, MesRollInfo::getRollId);
         return lqw;