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

feat(qc): 新增检查项和检查任务字段支持

Browse Source 
- 为 WmsCheckItem 及其相关 BO、VO 类新增目标上下限、标准目标、单位、定性定量字段-为 WmsCheckTask 及其相关 BO、VO 类新增校验目标、工段、工序、机组、检验结果、检验类型字段- 为 WmsCheckTaskItem 及其相关 BO、VO 类新增目标上下限、标准目标、单位、定性定量及实测值字段
- 更新 MyBatis XML 映射文件以支持新增字段的数据库映射
- 在服务实现类中为新增字段添加查询条件支持
This commit is contained in:
Joshi
2025-10-16 17:53:10 +08:00
parent e59767375f
commit c7f639bbf2
15 changed files with 168 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java
View File

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

17
klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java
View File

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

14
klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java
View File

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

11
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java
View File

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

18
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java
View File

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

14
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java
View File

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

12
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java
View File

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

15
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java
View File

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

17
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java
View File

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

6
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java
View File

@@ -62,6 +62,12 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsCheckItem> 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;
}

8
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java
View File

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

7
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
View File

@@ -95,6 +95,13 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsCheckTask> 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;
}

6
klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml
View File

@@ -7,6 +7,12 @@
<resultMap type="com.klp.mes.qc.domain.WmsCheckItem" id="WmsCheckItemResult">
<result property="itemId" column="item_id"/>
<result property="itemName" column="item_name"/>
<!-- 新增字段映射 -->
<result property="targetUpper" column="target_upper"/>
<result property="targetLower" column="target_lower"/>
<result property="standardTarget" column="standard_target"/>
<result property="unit" column="unit"/>
<result property="qualitativeQuantitative" column="qualitative_quantitative"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>

7
klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml
View File

@@ -9,6 +9,13 @@
<result property="checkTaskId" column="check_task_id"/>
<result property="checkItemId" column="check_item_id"/>
<result property="status" column="status"/>
<!-- 新增字段映射 -->
<result property="targetUpper" column="target_upper"/>
<result property="targetLower" column="target_lower"/>
<result property="standardTarget" column="standard_target"/>
<result property="unit" column="unit"/>
<result property="qualitativeQuantitative" column="qualitative_quantitative"/>
<result property="actualMeasure" column="actual_measure"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>

6
klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml
View File

@@ -7,6 +7,12 @@
<resultMap type="com.klp.mes.qc.domain.WmsCheckTask" id="WmsCheckTaskResult">
<result property="taskId" column="task_id"/>
<result property="taskName" column="task_name"/>
<result property="verifyTarget" column="verify_target"/>
<result property="workshopSection" column="workshop_section"/>
<result property="process" column="process"/>
<result property="unitGroup" column="unit_group"/>
<result property="inspectionResult" column="inspection_result"/>
<result property="inspectionType" column="inspection_type"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>