From e084e56841431a51f278c7a7383a83cf0d658d13 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 25 Jun 2026 11:07:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsFurnacePlanCoil):=20=E9=80=80=E7=81=AB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsFurnacePlanCoil 实体类中新增 contractNo 字段 - 在 WmsFurnacePlanCoilBo 业务对象中添加 contractNo 属性 - 更新 MyBatis 映射文件,添加 contract_no 字段映射 - 在服务层查询逻辑中加入合同号条件过滤 - 在 WmsFurnacePlanCoilVo 视图对象中添加合同号 Excel 导出支持 --- klp-wms/src/main/java/com/klp/domain/WmsFurnacePlanCoil.java | 5 +++++ .../main/java/com/klp/domain/bo/WmsFurnacePlanCoilBo.java | 5 +++++ .../main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java | 3 +++ .../com/klp/service/impl/WmsFurnacePlanCoilServiceImpl.java | 1 + .../main/resources/mapper/klp/WmsFurnacePlanCoilMapper.xml | 1 + 5 files changed, 15 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsFurnacePlanCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsFurnacePlanCoil.java index d45113848..5493ff3a8 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsFurnacePlanCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsFurnacePlanCoil.java @@ -46,6 +46,11 @@ public class WmsFurnacePlanCoil extends BaseEntity { */ private Integer furnaceLevel; + /** + * 合同号 + */ + private String contractNo; + /** * 删除标志(0=正常,1=已删除) */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanCoilBo.java index 9c60fbe71..902473856 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanCoilBo.java @@ -42,6 +42,11 @@ public class WmsFurnacePlanCoilBo extends BaseEntity { */ private Integer furnaceLevel; + /** + * 合同号 + */ + private String contractNo; + /** * 钢卷ID列表(逗号分隔) */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java index d313c1760..43c223c7f 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java @@ -34,6 +34,9 @@ public class WmsFurnacePlanCoilVo { @ExcelProperty(value = "炉火层级") private Integer furnaceLevel; + @ExcelProperty(value = "合同号") + private String contractNo; + @ExcelProperty(value = "入场钢卷号") private String enterCoilNo; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanCoilServiceImpl.java index d4364fc44..34f40b873 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanCoilServiceImpl.java @@ -64,6 +64,7 @@ public class WmsFurnacePlanCoilServiceImpl implements IWmsFurnacePlanCoilService lqw.eq(bo.getCoilId() != null, WmsFurnacePlanCoil::getCoilId, bo.getCoilId()); lqw.eq(bo.getLogicWarehouseId() != null, WmsFurnacePlanCoil::getLogicWarehouseId, bo.getLogicWarehouseId()); lqw.eq(bo.getFurnaceLevel() != null, WmsFurnacePlanCoil::getFurnaceLevel, bo.getFurnaceLevel()); + lqw.eq(bo.getContractNo() != null, WmsFurnacePlanCoil::getContractNo, bo.getContractNo()); return lqw; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsFurnacePlanCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsFurnacePlanCoilMapper.xml index a0a0ad868..3a746c15c 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsFurnacePlanCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsFurnacePlanCoilMapper.xml @@ -10,6 +10,7 @@ +