DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(eqp): 添加机组字段支持

Browse Source 
- 在EqpAuxiliaryMaterial实体类中添加unitTeam字段
- 在EqpAuxiliaryMaterialBo业务对象中添加unitTeam字段
- 更新EqpAuxiliaryMaterialMapper.xml映射文件添加unitTeam映射
- 在EqpAuxiliaryMaterialServiceImpl服务实现中添加机组查询条件
- 在EqpAuxiliaryMaterialVo视图对象中添加unitTeam字段并配置Excel导出
- 在EqpSparePart实体类中添加unitTeam字段
- 在EqpSparePartBo业务对象中添加unitTeam字段
- 更新EqpSparePartMapper.xml映射文件添加unitTeam映射和查询字段
- 在EqpSparePartServiceImpl服务实现中添加机组查询条件
- 在EqpSparePartVo视图对象中添加unitTeam字段并配置Excel导出
This commit is contained in:
Joshi
2026-03-19 15:46:20 +08:00
parent f7b2d2c3bf
commit 35cd5b03ff
10 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
View File

@@ -44,6 +44,10 @@ public class EqpAuxiliaryMaterial extends BaseEntity {
* 关联设备ID（可为空，通用辅料）
*/
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
private String unitTeam;
/**
* 当前库存数量
*/

4
klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
View File

@@ -44,6 +44,10 @@ public class EqpSparePart extends BaseEntity {
* 关联设备ID（可为空，通用备件）
*/
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
private String unitTeam;
/**
* 当前库存数量
*/

5
klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
View File

@@ -47,6 +47,11 @@ public class EqpAuxiliaryMaterialBo extends BaseEntity {
*/
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
private String unitTeam;
/**
* 当前库存数量
*/

5
klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
View File

@@ -47,6 +47,11 @@ public class EqpSparePartBo extends BaseEntity {
*/
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
private String unitTeam;
/**
* 当前库存数量
*/

6
klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
View File

@@ -56,6 +56,12 @@ public class EqpAuxiliaryMaterialVo {
@ExcelDictFormat(readConverterExp = "可=为空，通用辅料")
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
@ExcelProperty(value = "机组")
private String unitTeam;
/**
* 当前库存数量
*/

6
klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
View File

@@ -56,6 +56,12 @@ public class EqpSparePartVo {
@ExcelDictFormat(readConverterExp = "可=为空，通用备件")
private Long equipmentId;
/**
* 机组（如：1#机组、2#机组、公用机组等）
*/
@ExcelProperty(value = "机组")
private String unitTeam;
/**
* 当前库存数量
*/

1
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
View File

@@ -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;
}

2
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
View File

@@ -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;
}

1
klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
View File

@@ -11,6 +11,7 @@
<result property="auxiliaryModel" column="auxiliary_model"/>
<result property="unit" column="unit"/>
<result property="equipmentId" column="equipment_id"/>
<result property="unitTeam" column="unit_team"/>
<result property="quantity" column="quantity"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>

2
klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
View File

@@ -11,6 +11,7 @@
<result property="model" column="model"/>
<result property="unit" column="unit"/>
<result property="equipmentId" column="equipment_id"/>
<result property="unitTeam" column="unit_team"/>
<result property="quantity" column="quantity"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
@@ -27,6 +28,7 @@
sp.model,
sp.unit,
sp.equipment_id,
sp.unit_team,
em.equipment_name AS equipmentName,
sp.quantity,
sp.remark