diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java index ec932c02..f3590ee9 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java @@ -36,6 +36,10 @@ public class WmsInspectionItemTemplate extends BaseEntity { * 待检项(可存储单个待检项或待检项编码,多个可拆分或用JSON) */ private String inspectionItem; + /** + * 单位 + */ + private String templateUnit; /** * 逻辑删除标识:0=正常,1=已删 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java index 8f5e324b..99953869 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java @@ -37,6 +37,11 @@ public class WmsInspectionItemTemplateBo extends BaseEntity { */ private String inspectionItem; + /** + * 单位 + */ + private String templateUnit; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java index 2a6a3abd..81d68ede 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java @@ -46,6 +46,12 @@ public class WmsInspectionItemTemplateVo { @ExcelDictFormat(readConverterExp = "可=存储单个待检项或待检项编码,多个可拆分或用JSON") private String inspectionItem; + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String templateUnit; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java index b70ed44b..244565b4 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java @@ -74,6 +74,7 @@ public class WmsInspectionItemTemplateServiceImpl implements IWmsInspectionItemT lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), WmsInspectionItemTemplate::getTemplateName, bo.getTemplateName()); lqw.eq(StringUtils.isNotBlank(bo.getTemplateDesc()), WmsInspectionItemTemplate::getTemplateDesc, bo.getTemplateDesc()); lqw.eq(StringUtils.isNotBlank(bo.getInspectionItem()), WmsInspectionItemTemplate::getInspectionItem, bo.getInspectionItem()); + lqw.eq(StringUtils.isNotBlank(bo.getTemplateUnit()), WmsInspectionItemTemplate::getTemplateUnit, bo.getTemplateUnit()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml index 9516919a..9c363804 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml @@ -9,6 +9,7 @@ +