From 7a681887e5a8e1aab49acc886974d354c69a280e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 13:10:38 +0800
Subject: [PATCH] feat(mes): 新增质检指标分组树和平行测量功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
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 b64b62f..5958c95 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.hutool.core.util.ObjectUtil;
@@ -9,6 +10,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
+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.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.iqc.MesQcIqcMapper;
@@ -20,6 +22,7 @@
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
@@ -58,6 +61,9 @@
@Resource
private MesQcTemplateItemService templateItemService;
@Resource
+ @Lazy
+ private MesQcTemplateService templateService;
+ @Resource
private MesQcIqcLineService iqcLineService;
@Resource
private MesQcDefectRecordService defectRecordService;
@@ -91,9 +97,21 @@
// 1.2 鏍￠獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 1.3 閫氳繃 itemId + IQC 绫诲瀷鑷姩鏌ユ壘妯℃澘
- MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- createReqVO.getItemId(), MesQcTypeEnum.IQC.getType());
+ // 1.3 鏍规嵁浜у搧 + IQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
+ List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
+ createReqVO.getItemId(), MesQcTypeEnum.IQC.getType(), null, null);
+ if (CollUtil.isEmpty(templateItems)) {
+ throw exception(QC_NO_TEMPLATE);
+ }
+ MesQcTemplateItemDO templateItem = templateItems.get(0);
+ if (createReqVO.getTemplateId() != null) {
+ templateItem = templateItems.stream()
+ .filter(item -> Objects.equals(item.getTemplateId(), createReqVO.getTemplateId()))
+ .findFirst().orElse(null);
+ if (templateItem == null) {
+ throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
+ }
+ }
Long templateId = templateItem.getTemplateId();
// 2. 鎻掑叆涓昏〃
@@ -102,6 +120,13 @@
.setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity()))
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+ // 鎵ц鏍囧噯锛氱敤鎴锋湭濉椂鍥為��妯℃澘榛樿鍊�
+ if (StrUtil.isBlank(iqc.getExecuteStandard())) {
+ MesQcTemplateDO template = templateService.getTemplate(templateId);
+ if (template != null) {
+ iqc.setExecuteStandard(template.getDefaultExecuteStandard());
+ }
+ }
iqcMapper.insert(iqc);
// 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
--
Gitblit v1.9.3