From e10c196ff7348a4461e8facee10a208779244ece Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:30 +0800
Subject: [PATCH] 宁夏万通需求：出库单行支持主/辅单位录入；考勤节假日配置改为时间段；物料型号维护；设备批量删除；来料检验默认方案解析
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 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 353da9a..d30aa6b 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
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO;
@@ -16,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
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;
@@ -27,6 +29,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;
@@ -65,6 +68,8 @@
@Resource
private MesQcTemplateItemService templateItemService;
@Resource
+ private MesQcTemplateService templateService;
+ @Resource
private MesQcIqcLineService iqcLineService;
@Resource
private MesQcDefectRecordService defectRecordService;
@@ -101,22 +106,24 @@
// 1.2 鏍￠獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 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);
+ // 1.3 纭畾璐ㄦ鏂规锛氳川妫�鏂规涓庝骇鍝佺墿鏂欎笉缁戝畾锛屾樉寮忔寚瀹氭椂鍙牎楠屾柟妗堟湰韬彲鐢紱鏈寚瀹氭椂璧伴粯璁ゆ柟妗堣В鏋�
+ Long templateId;
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); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
+ MesQcTemplateDO template = templateService.getTemplate(createReqVO.getTemplateId());
+ if (template == null) {
+ throw new ServiceException(QC_TEMPLATE_NOT_EXISTS.getCode(), StrUtil.format(
+ "鎵�閫夎川妫�鏂规涓嶅瓨鍦紙ID={}锛夛紝鍙兘宸茶鍒犻櫎锛岃鍒锋柊鍚庨噸鏂伴�夋嫨璐ㄦ鏂规", createReqVO.getTemplateId()));
}
+ if (!CommonStatusEnum.isEnable(template.getStatus())) {
+ throw exception(QC_IQC_TEMPLATE_IS_DISABLE, template.getName());
+ }
+ if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.IQC.getType())) {
+ throw exception(QC_IQC_TEMPLATE_TYPE_NOT_MATCH, template.getName());
+ }
+ templateId = template.getId();
+ } else {
+ templateId = resolveDefaultIqcTemplateId(createReqVO.getItemId());
}
- Long templateId = templateItem.getTemplateId();
// 2. 鎻掑叆涓昏〃
MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
@@ -377,17 +384,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIqcFromArrivalNotice(Long noticeId, MesWmArrivalNoticeLineDO line, String noticeCode, Long vendorId) {
- // 1. 鏍￠獙鐗╂枡鏄惁閰嶇疆浜� IQC 妫�楠屾ā鏉�
- MesQcTemplateItemDO templateItem;
- try {
- templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- line.getItemId(), MesQcTypeEnum.IQC.getType());
- } catch (Exception e) {
- // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
- String itemInfo = getItemInfo(line.getItemId());
- throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
- }
- Long templateId = templateItem.getTemplateId();
+ // 1. 纭畾璐ㄦ鏂规锛氳川妫�鏂规涓庝骇鍝佺墿鏂欎笉缁戝畾锛岀墿鏂欐湭缁戝畾鏂规鏃跺彇浠讳竴鍚敤鐨勬潵鏂欐楠屾柟妗�
+ Long templateId = resolveDefaultIqcTemplateId(line.getItemId());
// 2. 鐢熸垚妫�楠屽崟缂栫爜
String code = "IQC" + System.currentTimeMillis();
@@ -418,21 +416,28 @@
}
/**
- * 鑾峰彇鐗╂枡淇℃伅锛堢紪鐮�+鍚嶇О锛�
+ * 瑙ｆ瀽鏉ユ枡妫�楠岀殑榛樿璐ㄦ鏂规锛氳川妫�鏂规涓庝骇鍝佺墿鏂欎笉缁戝畾銆�
+ *
+ * 1. 鐗╂枡宸茬粦瀹氭潵鏂欐楠屾柟妗堟椂锛屼紭鍏堟部鐢紙鍏煎瀛橀噺閰嶇疆锛夛紱
+ * 2. 鐗╂枡鏈粦瀹氭椂锛屽彇浠讳竴鍚敤涓旀娴嬬绫诲寘鍚潵鏂欐楠岀殑鏂规锛堟寜缂栧彿鍙栨渶鏃╁垱寤虹殑涓�涓級銆�
+ *
+ * @param itemId 浜у搧鐗╂枡缂栧彿
+ * @return 璐ㄦ鏂规缂栧彿
*/
- private String getItemInfo(Long itemId) {
- if (itemId == null) {
- return "鏈煡鐗╂枡";
+ private Long resolveDefaultIqcTemplateId(Long itemId) {
+ List<MesQcTemplateItemDO> boundList = templateItemService.getTemplateItemList(
+ itemId, MesQcTypeEnum.IQC.getType(), null, null);
+ if (CollUtil.isNotEmpty(boundList)) {
+ return boundList.get(0).getTemplateId();
}
- try {
- cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO item = mdmItemApi.getItem(itemId).getCheckedData();
- if (item != null) {
- return item.getCode() + "-" + item.getName();
- }
- } catch (Exception e) {
- // 蹇界暐寮傚父
+ List<MesQcTemplateDO> enabledTemplates = templateService.getEnabledTemplateListByType(MesQcTypeEnum.IQC.getType());
+ if (CollUtil.isEmpty(enabledTemplates)) {
+ throw exception(QC_IQC_NO_ENABLED_TEMPLATE);
}
- return "鐗╂枡ID:" + itemId;
+ return enabledTemplates.stream()
+ .map(MesQcTemplateDO::getId)
+ .min(Comparator.naturalOrder())
+ .orElseThrow(() -> exception(QC_IQC_NO_ENABLED_TEMPLATE));
}
@Override
--
Gitblit v1.9.3