From b567632e121ee7f6ce95f3aa3a8329dd7ba9a160 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 25 Feb 2026 00:14:49 +0800 Subject: [PATCH] refactor(mes-qc): 优化 IPQC/IQC 质检模块 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java | 7 ------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java | 7 ------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java | 53 +++++++++++++++++++++++++++++++++++++++++++---------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java | 7 ++----- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java | 12 ++++++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java | 5 ----- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java | 7 +++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java | 2 -- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 1 + yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java | 31 +++++++++++++++++++++++-------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java | 6 ++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 23 +++++++++++++---------- 14 files changed, 131 insertions(+), 87 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java index 3ffa1bd..26b740b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java @@ -85,13 +85,6 @@ public class MesQcIpqcLineController { .setIndicatorType(indicator.getType())); findAndThen(unitMeasureMap, vo.getUnitMeasureId(), unit -> vo.setUnitMeasureName(unit.getName())); - // 逐个查询工具名称（工具数量通常较少） - if (vo.getToolId() != null) { - MesTmToolDO tool = toolService.getTool(vo.getToolId()); - if (tool != null) { - vo.setToolName(tool.getName()); - } - } }); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java index e44f730..a856a0a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java @@ -26,9 +26,6 @@ public class MesQcIpqcPageReqVO extends PageParam { @Schema(description = "生产工单 ID", example = "10") private Long workOrderId; - @Schema(description = "工位 ID", example = "30") - private Long workstationId; - @Schema(description = "产品物料 ID", example = "50") private Long itemId; @@ -41,8 +38,4 @@ public class MesQcIpqcPageReqVO extends PageParam { @Schema(description = "检测人员用户 ID", example = "1") private Long inspectorUserId; - @Schema(description = "检测日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] inspectDate; - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java index c42e883..c1d6045 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java @@ -1,6 +1,10 @@ package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo; +import cn.hutool.core.util.ObjUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -38,10 +42,6 @@ public class MesQcIpqcSaveReqVO { @Schema(description = "来源单据 ID", example = "200") private Long sourceDocId; - // TODO @AI： - @Schema(description = "来源单据编号", example = "FB20250101001") - private String sourceDocCode; - @Schema(description = "来源单据行 ID", example = "300") private Long sourceLineId; @@ -51,6 +51,7 @@ public class MesQcIpqcSaveReqVO { @NotNull(message = "生产工单不能为空") private Long workOrderId; + // TODO @芋艿：【不确定】这里要怎么弄 @Schema(description = "生产任务 ID", example = "20") private Long taskId; @@ -58,6 +59,7 @@ public class MesQcIpqcSaveReqVO { @NotNull(message = "工位不能为空") private Long workstationId; + // TODO @芋艿：【不确定】这里要怎么弄 @Schema(description = "工序 ID", example = "40") private Long processId; @@ -68,22 +70,34 @@ public class MesQcIpqcSaveReqVO { // ========== 数量 ========== - @Schema(description = "检测数量", example = "100") + @Schema(description = "检测数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "检测数量不能为空") + @DecimalMin(value = "0", message = "检测数量不能小于 0") private BigDecimal checkQuantity; - @Schema(description = "合格品数量", example = "95") + @Schema(description = "合格品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "95") + @NotNull(message = "合格品数量不能为空") + @DecimalMin(value = "0", message = "合格品数量不能小于 0") private BigDecimal qualifiedQuantity; - @Schema(description = "不合格品数量", example = "5") + @Schema(description = "不合格品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5") + @NotNull(message = "不合格品数量不能为空") + @DecimalMin(value = "0", message = "不合格品数量不能小于 0") private BigDecimal unqualifiedQuantity; - @Schema(description = "工废数量", example = "2") + @Schema(description = "工废数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "工废数量不能为空") + @DecimalMin(value = "0", message = "工废数量不能小于 0") private BigDecimal laborScrapQuantity; - @Schema(description = "料废数量", example = "2") + @Schema(description = "料废数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "料废数量不能为空") + @DecimalMin(value = "0", message = "料废数量不能小于 0") private BigDecimal materialScrapQuantity; - @Schema(description = "其他废品数量", example = "1") + @Schema(description = "其他废品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "其他废品数量不能为空") + @DecimalMin(value = "0", message = "其他废品数量不能小于 0") private BigDecimal otherScrapQuantity; // ========== 检验 ========== @@ -100,4 +114,23 @@ public class MesQcIpqcSaveReqVO { @Schema(description = "备注", example = "备注") private String remark; + @AssertTrue(message = "检测数量必须等于合格品数量与不合格品数量之和") + @JsonIgnore + public boolean isQuantityValid() { + if (ObjUtil.hasNull(checkQuantity, qualifiedQuantity, unqualifiedQuantity)) { + return true; // @NotNull 会处理 null + } + return checkQuantity.compareTo(qualifiedQuantity.add(unqualifiedQuantity)) == 0; + } + + @AssertTrue(message = "工废、料废、其他废品数量之和不能超过不合格品数量") + @JsonIgnore + public boolean isScrapQuantityValid() { + if (ObjUtil.hasNull(unqualifiedQuantity, laborScrapQuantity, materialScrapQuantity, otherScrapQuantity)) { + return true; // @NotNull 会处理 null + } + BigDecimal scrapSum = laborScrapQuantity.add(materialScrapQuantity).add(otherScrapQuantity); + return scrapSum.compareTo(unqualifiedQuantity) <= 0; + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java index 34da6b2..dba7020 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java @@ -30,11 +30,8 @@ public class MesQcIpqcLineRespVO { @Schema(description = "检测指标类型", example = "QUANTITATIVE") private String indicatorType; - @Schema(description = "检测工具 ID", example = "5") - private Long toolId; - - @Schema(description = "检测工具名称", example = "卡尺") - private String toolName; + @Schema(description = "检测工具", example = "卡尺") + private String tool; @Schema(description = "检测方法", example = "目测") private String checkMethod; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java index ad23fbc..de1a369 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java @@ -63,14 +63,14 @@ public class MesQcIqcController { @Operation(summary = "创建来料检验单") @PreAuthorize("@ss.hasPermission('mes:qc-iqc:create')") public CommonResult createIqc(@Valid @RequestBody MesQcIqcSaveReqVO createReqVO) { - return success(iqcService.createIqc(createReqVO, getLoginUserId())); + return success(iqcService.createIqc(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新来料检验单") @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") public CommonResult updateIqc(@Valid @RequestBody MesQcIqcSaveReqVO updateReqVO) { - iqcService.updateIqc(updateReqVO, getLoginUserId()); + iqcService.updateIqc(updateReqVO); return success(true); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java index 172dceb..fab8802 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java @@ -71,6 +71,14 @@ public class MesQcIqcSaveReqVO { // ========== 检验 ========== + @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "检测人员不能为空") + private Long inspectorUserId; + + @Schema(description = "检测日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "检测日期不能为空") + private LocalDateTime inspectDate; + @Schema(description = "检测结果", example = "1") private Integer checkResult; @@ -78,10 +86,6 @@ public class MesQcIqcSaveReqVO { @NotNull(message = "来料日期不能为空") private LocalDateTime receiveDate; - @Schema(description = "检测日期", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "检测日期不能为空") - private LocalDateTime inspectDate; - @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java index 9dfae62..1bc91fd 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java @@ -65,11 +65,6 @@ public class MesQcIpqcDO extends BaseDO { * 来源单据类型 */ private String sourceDocType; - // TODO @AI：sourceDocCode 是不是不用存储？（晚点在处理，对应模块还没搞完） - /** - * 来源单据编号 - */ - private String sourceDocCode; /** * 来源单据行 ID */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java index 3843abf..e87e8dc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -44,11 +43,11 @@ public class MesQcIpqcLineDO extends BaseDO { */ private Long indicatorId; /** - * 检测工具 ID + * 检测工具 * - * 关联 {@link MesTmToolDO#getId()} + * 冗余 {@link MesQcIndicatorDO#getTool()} */ - private Long toolId; + private String tool; /** * 检测方法 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java index a370683..2a7bc21 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java @@ -20,11 +20,9 @@ public interface MesQcIpqcMapper extends BaseMapperX { .likeIfPresent(MesQcIpqcDO::getCode, reqVO.getCode()) .eqIfPresent(MesQcIpqcDO::getType, reqVO.getType()) .eqIfPresent(MesQcIpqcDO::getWorkOrderId, reqVO.getWorkOrderId()) - .eqIfPresent(MesQcIpqcDO::getWorkstationId, reqVO.getWorkstationId()) .eqIfPresent(MesQcIpqcDO::getItemId, reqVO.getItemId()) .eqIfPresent(MesQcIpqcDO::getCheckResult, reqVO.getCheckResult()) .eqIfPresent(MesQcIpqcDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MesQcIpqcDO::getInspectDate, reqVO.getInspectDate()) .eqIfPresent(MesQcIpqcDO::getInspectorUserId, reqVO.getInspectorUserId()) .orderByDesc(MesQcIpqcDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index d7e5747..06f5579 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -261,6 +261,7 @@ public interface ErrorCodeConstants { ErrorCode QC_IPQC_NOT_PREPARE = new ErrorCode(1_040_604_002, "只有草稿状态的检验单才可操作"); ErrorCode QC_IPQC_QUANTITY_MISMATCH = new ErrorCode(1_040_604_004, "合格品与不合格品数量之和须等于检测数量"); ErrorCode QC_IPQC_NO_TEMPLATE = new ErrorCode(1_040_604_005, "当前产品未配置 IPQC 检测模板"); + ErrorCode QC_IPQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_604_006, "完成检验单前，检测结果必须填写"); // ========== MES 质量管理-过程检验行（1-040-604-100） ========== ErrorCode QC_IPQC_LINE_NOT_EXISTS = new ErrorCode(1_040_604_100, "过程检验行不存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java index 4a3342a..48f38fb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java @@ -5,21 +5,25 @@ import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.line.MesQcIpqcLinePageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcLineDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcLineMapper; import cn.iocoder.yudao.module.mes.dal.mysql.qc.template.MesQcTemplateIndicatorMapper; import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; +import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** @@ -36,6 +40,9 @@ public class MesQcIpqcLineServiceImpl implements MesQcIpqcLineService { @Resource private MesQcTemplateIndicatorMapper templateIndicatorMapper; + @Resource + private MesQcIndicatorService indicatorService; + @Override public MesQcIpqcLineDO getIpqcLine(Long id) { return ipqcLineMapper.selectById(id); @@ -53,14 +60,22 @@ public class MesQcIpqcLineServiceImpl implements MesQcIpqcLineService { @Override public void createLinesFromTemplate(Long ipqcId, Long templateId) { - List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); - List lines = convertList(indicators, indicator -> new MesQcIpqcLineDO() - .setIpqcId(ipqcId).setIndicatorId(indicator.getIndicatorId()) - .setToolId(null) // TODO @芋艿：模板指标暂无 toolId，后续可扩展 - .setCheckMethod(indicator.getCheckMethod()) - .setStandardValue(indicator.getStandardValue()).setUnitMeasureId(indicator.getUnitMeasureId()) - .setMaxThreshold(indicator.getThresholdMax()).setMinThreshold(indicator.getThresholdMin()) - .setCriticalQuantity(0).setMajorQuantity(0).setMinorQuantity(0)); + List templateIndicators = templateIndicatorMapper.selectListByTemplateId(templateId); + if (CollUtil.isEmpty(templateIndicators)) { + return; + } + Map indicatorMap = indicatorService.getIndicatorMap( + convertSet(templateIndicators, MesQcTemplateIndicatorDO::getIndicatorId)); + List lines = convertList(templateIndicators, templateIndicator -> { + MesQcIndicatorDO indicator = indicatorMap.get(templateIndicator.getIndicatorId()); + return new MesQcIpqcLineDO() + .setIpqcId(ipqcId).setIndicatorId(templateIndicator.getIndicatorId()) + .setTool(indicator != null ? indicator.getTool() : null) + .setCheckMethod(templateIndicator.getCheckMethod()) + .setStandardValue(templateIndicator.getStandardValue()).setUnitMeasureId(templateIndicator.getUnitMeasureId()) + .setMaxThreshold(templateIndicator.getThresholdMax()).setMinThreshold(templateIndicator.getThresholdMin()) + .setCriticalQuantity(0).setMajorQuantity(0).setMinorQuantity(0); + }); ipqcLineMapper.insertBatch(lines); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java index f832c11..6ab589c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java @@ -8,15 +8,17 @@ import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqV import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper; import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; import cn.iocoder.yudao.module.mes.enums.MesOrderStatusEnum; import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -55,8 +57,14 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { private MesMdWorkstationService workstationService; @Resource @Lazy + private MesMdItemService itemService; + @Resource + @Lazy private MesQcDefectRecordService defectRecordService; + @Resource + private AdminUserApi adminUserApi; + @Override @Transactional(rollbackFor = Exception.class) public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) { @@ -66,23 +74,24 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()); // 1.3 校验工位存在 workstationService.validateWorkstationExists(createReqVO.getWorkstationId()); - // 1.4 根据产品 + 检验类型自动匹配模板 - // TODO @AI：参考 iqc，应该通过 getRequiredTemplatesByItemIdAndType 方法； - MesQcTemplateDO template = templateDetailService.getTemplateByItemIdAndType( + // 1.4 校验检测人员存在 + adminUserApi.validateUser(createReqVO.getInspectorUserId()); + // 1.5 校验物料存在 + itemService.validateItemExists(createReqVO.getItemId()); + // 1.6 根据产品 + 检验类型自动匹配模板 + MesQcTemplateItemDO templateItem = templateDetailService.getRequiredTemplateByItemIdAndType( workOrder.getProductId(), MesQcTypeEnum.IPQC.getType()); - if (template == null) { - throw exception(QC_IPQC_NO_TEMPLATE); - } + Long templateId = templateItem.getTemplateId(); // TODO @AI：processId 不应该是前端传递，而是通过 workstation + work order + route 表，联合查询出来的； // 2. 插入主表 MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class); ipqc.setItemId(workOrder.getProductId()); - ipqc.setTemplateId(template.getId()).setStatus(MesOrderStatusEnum.DRAFT.getType()); + ipqc.setTemplateId(templateId).setStatus(MesOrderStatusEnum.DRAFT.getType()); ipqcMapper.insert(ipqc); // 3. 从模板指标自动生成检验行 - ipqcLineService.createLinesFromTemplate(ipqc.getId(), template.getId()); + ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId); return ipqc.getId(); } @@ -92,6 +101,14 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { validateIpqcStatusPrepare(updateReqVO.getId()); // 1.2 校验编号唯一 validateIpqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + // 1.3 校验工单存在 + workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId()); + // 1.4 校验工位存在 + workstationService.validateWorkstationExists(updateReqVO.getWorkstationId()); + // 1.5 校验检测人员存在 + adminUserApi.validateUser(updateReqVO.getInspectorUserId()); + // 1.6 校验物料存在 + itemService.validateItemExists(updateReqVO.getItemId()); // 2. 更新 MesQcIpqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIpqcDO.class); @@ -102,13 +119,9 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { public void completeIpqc(Long id) { // 1.1 校验存在 + 草稿状态 MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id); - // 1.2 校验合格品 + 不合格品 = 检测数量 - if (ipqc.getCheckQuantity() != null && ipqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { - BigDecimal qualified = ipqc.getQualifiedQuantity() != null ? ipqc.getQualifiedQuantity() : BigDecimal.ZERO; - BigDecimal unqualified = ipqc.getUnqualifiedQuantity() != null ? ipqc.getUnqualifiedQuantity() : BigDecimal.ZERO; - if (qualified.add(unqualified).compareTo(ipqc.getCheckQuantity()) != 0) { - throw exception(QC_IPQC_QUANTITY_MISMATCH); - } + // 1.2 校验检测结论必填 + if (ipqc.getCheckResult() == null) { + throw exception(QC_IPQC_CHECK_RESULT_EMPTY); } // 2. 更新状态为已完成 @@ -179,11 +192,14 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { @Override public void recalculateDefectStats(Long ipqcId, List records) { + MesQcIpqcDO ipqc = validateIpqcExists(ipqcId); // 1. 行级缺陷统计 ipqcLineService.recalculateLineDefectStats(ipqcId, records); // 2.1 汇总主表的缺陷数量 - int totalCritical = 0, totalMajor = 0, totalMinor = 0; + int totalCritical = 0; + int totalMajor = 0; + int totalMinor = 0; for (MesQcDefectRecordDO record : records) { int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1); if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) { @@ -196,8 +212,7 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN); } } - // 2.2 计算缺陷率（IPQC 的 checkQuantity 是 BigDecimal） - MesQcIpqcDO ipqc = validateIpqcExists(ipqcId); + // 2.2 计算缺陷率 BigDecimal criticalRate = BigDecimal.ZERO; BigDecimal majorRate = BigDecimal.ZERO; BigDecimal minorRate = BigDecimal.ZERO; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java index 181b365..d2619d4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java @@ -22,18 +22,16 @@ public interface MesQcIqcService { * 创建来料检验单 * * @param createReqVO 创建信息 - * @param inspectorUserId 检测人员用户 ID * @return 编号 */ - Long createIqc(@Valid MesQcIqcSaveReqVO createReqVO, Long inspectorUserId); + Long createIqc(@Valid MesQcIqcSaveReqVO createReqVO); /** * 更新来料检验单 * * @param updateReqVO 更新信息 - * @param inspectorUserId 检测人员用户 ID */ - void updateIqc(@Valid MesQcIqcSaveReqVO updateReqVO, Long inspectorUserId); + void updateIqc(@Valid MesQcIqcSaveReqVO updateReqVO); /** * 完成来料检验单 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java index 5ef0710..0537d22 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java @@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService; import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateDetailService; import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,9 +46,9 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { @Resource private MesQcIqcMapper iqcMapper; + @Resource private MesQcTemplateDetailService templateDetailService; - @Resource private MesQcIqcLineService iqcLineService; @Resource @@ -59,17 +60,22 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { @Resource private MesMdItemService itemService; + @Resource + private AdminUserApi adminUserApi; + @Override @Transactional(rollbackFor = Exception.class) - public Long createIqc(MesQcIqcSaveReqVO createReqVO, Long inspectorUserId) { + public Long createIqc(MesQcIqcSaveReqVO createReqVO) { // 1.1 校验编号唯一 validateIqcCodeUnique(null, createReqVO.getCode()); // 1.2 校验供应商、物料存在 vendorService.validateVendorExists(createReqVO.getVendorId()); itemService.validateItemExists(createReqVO.getItemId()); - // 1.3 校验来源单据参数，并验证数据存在 + // 1.3 校验检测人员存在 + adminUserApi.validateUser(createReqVO.getInspectorUserId()); + // 1.4 校验来源单据参数，并验证数据存在 validateSourceDoc(createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId()); - // 1.4 通过 itemId + IQC 类型自动查找模板 + // 1.5 通过 itemId + IQC 类型自动查找模板 MesQcTemplateItemDO templateItem = templateDetailService.getRequiredTemplateByItemIdAndType( createReqVO.getItemId(), MesQcTypeEnum.IQC.getType()); Long templateId = templateItem.getTemplateId(); @@ -78,7 +84,6 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class); iqc.setTemplateId(templateId); iqc.setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity())); - iqc.setInspectorUserId(inspectorUserId); iqc.setStatus(MesOrderStatusEnum.DRAFT.getType()); iqcMapper.insert(iqc); @@ -88,7 +93,7 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { } @Override - public void updateIqc(MesQcIqcSaveReqVO updateReqVO, Long inspectorUserId) { + public void updateIqc(MesQcIqcSaveReqVO updateReqVO) { // 1.1 校验存在 + 草稿状态 validateIqcStatusPrepare(updateReqVO.getId()); // 1.2 校验编号唯一 @@ -96,13 +101,14 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { // 1.3 校验供应商、物料存在 vendorService.validateVendorExists(updateReqVO.getVendorId()); itemService.validateItemExists(updateReqVO.getItemId()); + // 1.4 校验检测人员存在 + adminUserApi.validateUser(updateReqVO.getInspectorUserId()); // 2. 更新主表 MesQcIqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIqcDO.class); updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 不允许修改来源单据 updateObj.setTemplateId(null); // 不允许修改模板 updateObj.setCheckQuantity(updateReqVO.getQualifiedQuantity().add(updateReqVO.getUnqualifiedQuantity())); - updateObj.setInspectorUserId(inspectorUserId); iqcMapper.updateById(updateObj); } @@ -110,11 +116,9 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { public void completeIqc(Long id) { // 1.1 校验存在 + 草稿状态 MesQcIqcDO iqc = validateIqcStatusPrepare(id); - // DONE @AI：已修复，增加 checkResult 必填校验 if (iqc.getCheckResult() == null) { throw exception(QC_IQC_CHECK_RESULT_EMPTY); } - // DONE @AI：已修复，数量校验已在 MesQcIqcSaveReqVO 的 @AssertTrue 中保证，此处移除 // 2. 更新状态为已完成 MesQcIqcDO updateObj = new MesQcIqcDO() @@ -135,7 +139,6 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { if (iqc.getSourceDocType() == null) { return; } - // DONE @AI：已修复，使用 ObjectUtil.hasNull() 简化判断 if (ObjectUtil.hasNull(iqc.getSourceLineId(), iqc.getSourceDocId())) { throw new IllegalArgumentException( "IQC 单[" + iqc.getId() + "] sourceDocType 非空但 sourceLineId 或 sourceDocId 为空"); -- libgit2 0.21.4