diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java index bbb17378..88274c9b 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java @@ -28,6 +28,14 @@ public class EqpEquipmentPart extends BaseEntity { * 巡检部位 */ private String inspectPart; + /** + * 产线 + */ + private String productionLine; + /** + * 产线段 + */ + private String lineSection; /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java index 35645440..4f66b435 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java @@ -28,6 +28,16 @@ public class EqpEquipmentPartBo extends BaseEntity { */ private String inspectPart; + /** + * 产线 + */ + private String productionLine; + + /** + * 产线段 + */ + private String lineSection; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java index 88bb69ca..f82f0f0e 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java @@ -33,6 +33,18 @@ public class EqpEquipmentPartVo { @ExcelProperty(value = "巡检部位") private String inspectPart; + /** + * 产线 + */ + @ExcelProperty(value = "产线") + private String productionLine; + + /** + * 产线段 + */ + @ExcelProperty(value = "产线段") + private String lineSection; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java index 36df7713..b79232aa 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java @@ -79,6 +79,8 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart()); + lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine()); + lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml index cba59428..39853e5f 100644 --- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml @@ -7,6 +7,8 @@ + +