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 88274c9b..630373d2 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 @@ -40,6 +40,11 @@ public class EqpEquipmentPart extends BaseEntity { * 备注 */ private String remark; + /** + * 负责人 + */ + private String responsiblePerson; + /** * 删除标识 0正常 2删除 */ 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 4f66b435..8dab0af3 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 @@ -38,6 +38,11 @@ public class EqpEquipmentPartBo extends BaseEntity { */ private String lineSection; + /** + * 负责人 + */ + private String responsiblePerson; + /** * 备注 */ 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 f82f0f0e..b1a6c416 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 @@ -45,6 +45,12 @@ public class EqpEquipmentPartVo { @ExcelProperty(value = "产线段") private String lineSection; + /** + * 负责人 + */ + @ExcelProperty(value = "负责人") + private String responsiblePerson; + /** * 备注 */ 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 36f90973..92fa3ccc 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 @@ -84,6 +84,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService { 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()); + lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson()); 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 39853e5f..1feab84e 100644 --- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml @@ -10,6 +10,7 @@ + diff --git a/klp-ui/src/views/mes/eqp/check/part.vue b/klp-ui/src/views/mes/eqp/check/part.vue index 58367e4e..093014ee 100644 --- a/klp-ui/src/views/mes/eqp/check/part.vue +++ b/klp-ui/src/views/mes/eqp/check/part.vue @@ -25,6 +25,14 @@ @keyup.enter.native="handleQuery" /> + + + 搜索 重置 @@ -80,6 +88,7 @@ +