From 7d634d7b45a87c6c0d6ed229df809e0efc87bb2b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 18 May 2026 16:01:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(roll):=20=E8=BD=A7=E8=BE=8A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8E=82=E5=AE=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 实体中新增 manufacturer 字段 - 在 MesRollInfoBo 中添加 manufacturer 查询条件 - 在查询逻辑中加入厂家字段的模糊匹配功能 - 在 MesRollInfoVo 中增加 manufacturer 导出映射 - 完善辊筒信息的厂家数据管理功能 --- 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 58602b1c..fdae7bfa 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 @@ -68,6 +68,9 @@ public class MesRollInfo extends BaseEntity { /** 制造日期 */ private Date manufactureDate; + /** 厂家 */ + private String manufacturer; + @TableLogic private Integer delFlag; } 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 a637abb6..040912de 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 @@ -56,5 +56,8 @@ public class MesRollInfoBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date manufactureDate; + /** 厂家 */ + private String manufacturer; + private String remark; } 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 5b2d45c3..89c8184c 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 @@ -67,6 +67,9 @@ public class MesRollInfoVo { @ExcelProperty("制造日期") private Date manufactureDate; + @ExcelProperty("厂家") + private String manufacturer; + @ExcelProperty("备注") private String remark; 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 fe31b1c0..3c412e6d 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.getManufacturer()), MesRollInfo::getManufacturer, bo.getManufacturer()); lqw.orderByAsc(MesRollInfo::getRollType, MesRollInfo::getRollId); return lqw; }