From c7f639bbf29af4987f5558dd614c9753e8b10e0c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 16 Oct 2025 17:53:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E5=92=8C=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=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 - 为 WmsCheckItem 及其相关 BO、VO 类新增目标上下限、标准目标、单位、定性定量字段-为 WmsCheckTask 及其相关 BO、VO 类新增校验目标、工段、工序、机组、检验结果、检验类型字段- 为 WmsCheckTaskItem 及其相关 BO、VO 类新增目标上下限、标准目标、单位、定性定量及实测值字段 - 更新 MyBatis XML 映射文件以支持新增字段的数据库映射 - 在服务实现类中为新增字段添加查询条件支持 --- .../com/klp/mes/qc/domain/WmsCheckItem.java | 13 ++++++++++++- .../com/klp/mes/qc/domain/WmsCheckTask.java | 17 +++++++++++++++++ .../klp/mes/qc/domain/WmsCheckTaskItem.java | 14 ++++++++++++++ .../klp/mes/qc/domain/bo/WmsCheckItemBo.java | 11 +++++++++++ .../klp/mes/qc/domain/bo/WmsCheckTaskBo.java | 18 ++++++++++++++++++ .../mes/qc/domain/bo/WmsCheckTaskItemBo.java | 14 +++++++++++++- .../klp/mes/qc/domain/vo/WmsCheckItemVo.java | 12 ++++++++++++ .../mes/qc/domain/vo/WmsCheckTaskItemVo.java | 15 ++++++++++++++- .../klp/mes/qc/domain/vo/WmsCheckTaskVo.java | 17 +++++++++++++++++ .../service/impl/WmsCheckItemServiceImpl.java | 6 ++++++ .../impl/WmsCheckTaskItemServiceImpl.java | 8 ++++++++ .../service/impl/WmsCheckTaskServiceImpl.java | 7 +++++++ .../resources/mapper/qc/WmsCheckItemMapper.xml | 6 ++++++ .../mapper/qc/WmsCheckTaskItemMapper.xml | 7 +++++++ .../resources/mapper/qc/WmsCheckTaskMapper.xml | 6 ++++++ 15 files changed, 168 insertions(+), 3 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java index 812ae3e5..77a6eb7c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java @@ -5,6 +5,8 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * 检查项对象 wms_check_item @@ -37,5 +39,14 @@ public class WmsCheckItem extends BaseEntity { * 备注 */ private String remark; - + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java index 1e41920b..2cb001a7 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java @@ -38,4 +38,21 @@ public class WmsCheckTask extends BaseEntity { */ private String remark; + // 校验目标（JSON格式，存储复杂校验规则） + private String verifyTarget; + + // 工段 + private String workshopSection; + + // 工序 + private String process; + + // 机组 + private String unitGroup; + + // 检验结果：0=未检验，1=合格，2=不合格 + private Integer inspectionResult; + + // 检验类型 + private String inspectionType; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java index 9c9899ad..174e72c9 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java @@ -5,6 +5,8 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * 检查任务与检查项关联对象 wms_check_task_item @@ -45,5 +47,17 @@ public class WmsCheckTaskItem extends BaseEntity { * 备注 */ private String remark; + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; + //实测值 + private BigDecimal actualMeasure; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java index b2d7d04b..0a08a928 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java @@ -4,6 +4,7 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.math.BigDecimal; /** @@ -32,5 +33,15 @@ public class WmsCheckItemBo extends BaseEntity { */ private String remark; + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java index 481fba25..dc0acd3b 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java @@ -34,5 +34,23 @@ public class WmsCheckTaskBo extends BaseEntity { */ private String remark; + // 校验目标（JSON格式，存储复杂校验规则） + private String verifyTarget; + + // 工段 + private String workshopSection; + + // 工序 + private String process; + + // 机组 + private String unitGroup; + + // 检验结果：0=未检验，1=合格，2=不合格 + private Integer inspectionResult; + + // 检验类型 + private String inspectionType; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java index 29c732fc..af3802d2 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java @@ -4,6 +4,7 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.math.BigDecimal; /** @@ -41,6 +42,17 @@ public class WmsCheckTaskItemBo extends BaseEntity { * 备注 */ private String remark; - + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; + //实测值 + private BigDecimal actualMeasure; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java index 9fda362b..f24f8cc6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import java.math.BigDecimal; + /** * 检查项视图对象 wms_check_item @@ -41,5 +43,15 @@ public class WmsCheckItemVo { * 检查项状态 */ private String status; + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java index 30df0b79..ff8fe9f6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java @@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import java.math.BigDecimal; + /** * 检查任务与检查项关联视图对象 wms_check_task_item @@ -48,6 +50,17 @@ public class WmsCheckTaskItemVo { */ @ExcelProperty(value = "备注") private String remark; - + //目标上限 + private BigDecimal targetUpper; + //目标下限 + private BigDecimal targetLower; + //标准目标 + private BigDecimal standardTarget; + //单位 + private String unit; + //定性定量 + private Integer qualitativeQuantitative; + //实测值 + private BigDecimal actualMeasure; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java index 5724a1ae..63550a4c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java @@ -52,4 +52,21 @@ public class WmsCheckTaskVo { */ private String itemNames; + // 校验目标（JSON格式，存储复杂校验规则） + private String verifyTarget; + + // 工段 + private String workshopSection; + + // 工序 + private String process; + + // 机组 + private String unitGroup; + + // 检验结果：0=未检验，1=合格，2=不合格 + private Integer inspectionResult; + + // 检验类型 + private String inspectionType; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java index 83e8f88f..c9fabd9a 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java @@ -62,6 +62,12 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getItemName()), WmsCheckItem::getItemName, bo.getItemName()); + // 新增字段查询条件 + lqw.eq(bo.getTargetUpper() != null, WmsCheckItem::getTargetUpper, bo.getTargetUpper()); + lqw.eq(bo.getTargetLower() != null, WmsCheckItem::getTargetLower, bo.getTargetLower()); + lqw.eq(bo.getStandardTarget() != null, WmsCheckItem::getStandardTarget, bo.getStandardTarget()); + lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckItem::getUnit, bo.getUnit()); + lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckItem::getQualitativeQuantitative, bo.getQualitativeQuantitative()); return lqw; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java index 94b475d5..c50213b0 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java @@ -6,6 +6,7 @@ import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.mes.qc.domain.bo.WmsCheckTaskItemBo; @@ -63,6 +64,13 @@ public class WmsCheckTaskItemServiceImpl implements IWmsCheckTaskItemService { lqw.eq(bo.getCheckTaskId() != null, WmsCheckTaskItem::getCheckTaskId, bo.getCheckTaskId()); lqw.eq(bo.getCheckItemId() != null, WmsCheckTaskItem::getCheckItemId, bo.getCheckItemId()); lqw.eq(bo.getStatus() != null, WmsCheckTaskItem::getStatus, bo.getStatus()); + // 新增字段查询条件 + lqw.eq(bo.getTargetUpper() != null, WmsCheckTaskItem::getTargetUpper, bo.getTargetUpper()); + lqw.eq(bo.getTargetLower() != null, WmsCheckTaskItem::getTargetLower, bo.getTargetLower()); + lqw.eq(bo.getStandardTarget() != null, WmsCheckTaskItem::getStandardTarget, bo.getStandardTarget()); + lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckTaskItem::getUnit, bo.getUnit()); + lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckTaskItem::getQualitativeQuantitative, bo.getQualitativeQuantitative()); + lqw.eq(bo.getActualMeasure() != null, WmsCheckTaskItem::getActualMeasure, bo.getActualMeasure()); return lqw; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index dde497c7..d1291cae 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -95,6 +95,13 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getTaskName()), WmsCheckTask::getTaskName, bo.getTaskName()); + // 新增字段查询条件 + lqw.like(StringUtils.isNotBlank(bo.getVerifyTarget()), WmsCheckTask::getVerifyTarget, bo.getVerifyTarget()); + lqw.like(StringUtils.isNotBlank(bo.getWorkshopSection()), WmsCheckTask::getWorkshopSection, bo.getWorkshopSection()); + lqw.like(StringUtils.isNotBlank(bo.getProcess()), WmsCheckTask::getProcess, bo.getProcess()); + lqw.like(StringUtils.isNotBlank(bo.getUnitGroup()), WmsCheckTask::getUnitGroup, bo.getUnitGroup()); + lqw.eq(bo.getInspectionResult() != null, WmsCheckTask::getInspectionResult, bo.getInspectionResult()); + lqw.like(StringUtils.isNotBlank(bo.getInspectionType()), WmsCheckTask::getInspectionType, bo.getInspectionType()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml index e4a88d38..54ae22d4 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml @@ -7,6 +7,12 @@ + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml index 790ac0cc..aacd0886 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml @@ -9,6 +9,13 @@ + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index f8af543d..489b471b 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -7,6 +7,12 @@ + + + + + +