From 35cd5b03ffaf4405ac99b017af47f9b96919bd56 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 19 Mar 2026 15:46:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(eqp):=20=E6=B7=BB=E5=8A=A0=E6=9C=BA?=
=?UTF-8?q?=E7=BB=84=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
- 在EqpAuxiliaryMaterial实体类中添加unitTeam字段
- 在EqpAuxiliaryMaterialBo业务对象中添加unitTeam字段
- 更新EqpAuxiliaryMaterialMapper.xml映射文件添加unitTeam映射
- 在EqpAuxiliaryMaterialServiceImpl服务实现中添加机组查询条件
- 在EqpAuxiliaryMaterialVo视图对象中添加unitTeam字段并配置Excel导出
- 在EqpSparePart实体类中添加unitTeam字段
- 在EqpSparePartBo业务对象中添加unitTeam字段
- 更新EqpSparePartMapper.xml映射文件添加unitTeam映射和查询字段
- 在EqpSparePartServiceImpl服务实现中添加机组查询条件
- 在EqpSparePartVo视图对象中添加unitTeam字段并配置Excel导出
---
.../java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java | 4 ++++
.../src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java | 4 ++++
.../com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java | 5 +++++
.../main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java | 5 +++++
.../com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java | 6 ++++++
.../main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java | 6 ++++++
.../eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java | 1 +
.../klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java | 2 ++
.../resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml | 1 +
.../src/main/resources/mapper/eqp/EqpSparePartMapper.xml | 2 ++
10 files changed, 36 insertions(+)
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
index 24e6f172..54135df6 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
@@ -44,6 +44,10 @@ public class EqpAuxiliaryMaterial extends BaseEntity {
* 关联设备ID（可为空，通用辅料）
*/
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ private String unitTeam;
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
index cda1a476..cf457334 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
@@ -44,6 +44,10 @@ public class EqpSparePart extends BaseEntity {
* 关联设备ID（可为空，通用备件）
*/
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ private String unitTeam;
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
index 280dd82c..3bc50f53 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
@@ -47,6 +47,11 @@ public class EqpAuxiliaryMaterialBo extends BaseEntity {
*/
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ private String unitTeam;
+
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
index 9fb11afb..26c28a0b 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
@@ -47,6 +47,11 @@ public class EqpSparePartBo extends BaseEntity {
*/
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ private String unitTeam;
+
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
index 0c56df6c..9193bdff 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
@@ -56,6 +56,12 @@ public class EqpAuxiliaryMaterialVo {
@ExcelDictFormat(readConverterExp = "可=为空，通用辅料")
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ @ExcelProperty(value = "机组")
+ private String unitTeam;
+
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
index d1b19c7a..723789ca 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
@@ -56,6 +56,12 @@ public class EqpSparePartVo {
@ExcelDictFormat(readConverterExp = "可=为空，通用备件")
private Long equipmentId;
+ /**
+ * 机组（如：1#机组、2#机组、公用机组等）
+ */
+ @ExcelProperty(value = "机组")
+ private String unitTeam;
+
/**
* 当前库存数量
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
index d25e500c..5b6aac46 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
@@ -66,6 +66,7 @@ public class EqpAuxiliaryMaterialServiceImpl implements IEqpAuxiliaryMaterialSer
lqw.eq(StringUtils.isNotBlank(bo.getAuxiliaryModel()), EqpAuxiliaryMaterial::getAuxiliaryModel, bo.getAuxiliaryModel());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EqpAuxiliaryMaterial::getUnit, bo.getUnit());
lqw.eq(bo.getEquipmentId() != null, EqpAuxiliaryMaterial::getEquipmentId, bo.getEquipmentId());
+ lqw.like(StringUtils.isNotBlank(bo.getUnitTeam()), EqpAuxiliaryMaterial::getUnitTeam, bo.getUnitTeam());
lqw.eq(bo.getQuantity() != null, EqpAuxiliaryMaterial::getQuantity, bo.getQuantity());
return lqw;
}
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
index 75e59fae..b7f9001d 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
@@ -58,6 +58,7 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService {
qw.eq(StringUtils.isNotBlank(bo.getModel()), "sp.model", bo.getModel());
qw.eq(StringUtils.isNotBlank(bo.getUnit()), "sp.unit", bo.getUnit());
qw.eq(bo.getEquipmentId() != null, "sp.equipment_id", bo.getEquipmentId());
+ qw.like(StringUtils.isNotBlank(bo.getUnitTeam()), "sp.unit_team", bo.getUnitTeam());
qw.eq(bo.getQuantity() != null, "sp.quantity", bo.getQuantity());
//逻辑删除
qw.eq("sp.del_flag", 0);
@@ -81,6 +82,7 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService {
lqw.eq(StringUtils.isNotBlank(bo.getModel()), EqpSparePart::getModel, bo.getModel());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EqpSparePart::getUnit, bo.getUnit());
lqw.eq(bo.getEquipmentId() != null, EqpSparePart::getEquipmentId, bo.getEquipmentId());
+ lqw.like(StringUtils.isNotBlank(bo.getUnitTeam()), EqpSparePart::getUnitTeam, bo.getUnitTeam());
lqw.eq(bo.getQuantity() != null, EqpSparePart::getQuantity, bo.getQuantity());
return lqw;
}
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
index b0b0999f..8d3b6743 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
@@ -11,6 +11,7 @@
+
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
index 6db91329..c861085a 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
@@ -11,6 +11,7 @@
+
@@ -27,6 +28,7 @@
sp.model,
sp.unit,
sp.equipment_id,
+ sp.unit_team,
em.equipment_name AS equipmentName,
sp.quantity,
sp.remark