From 4dc00a72e6229e7fdcd6055132cfb4128da1774f Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:53:40 +0800
Subject: [PATCH] 宁夏万通需求：生产领料取消三个字段必填；来料检验质检方案与产品物料解绑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 155 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 142 insertions(+), 13 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 975ddc0..1281815 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,13 +2,22 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
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;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+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;
@@ -20,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;
@@ -58,6 +68,8 @@
@Resource
private MesQcTemplateItemService templateItemService;
@Resource
+ private MesQcTemplateService templateService;
+ @Resource
private MesQcIqcLineService iqcLineService;
@Resource
private MesQcDefectRecordService defectRecordService;
@@ -83,6 +95,9 @@
@Lazy
private MesQcNcrService ncrService;
+ @Resource
+ private MesQcImportHelper qcImportHelper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
@@ -91,22 +106,25 @@
// 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 = templateItemService.getRequiredTemplateByItemIdAndType(
+ createReqVO.getItemId(), MesQcTypeEnum.IQC.getType()).getTemplateId();
}
- Long templateId = templateItem.getTemplateId();
// 2. 鎻掑叆涓昏〃
MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
@@ -425,4 +443,115 @@
return "鐗╂枡ID:" + itemId;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesQcImportRespVO importIqcList(List<MesQcIqcImportExcelVO> importList) {
+ MesQcImportRespVO respVO = MesQcImportRespVO.builder()
+ .createList(new ArrayList<>()).failureList(new LinkedHashMap<>()).build();
+ if (CollUtil.isEmpty(importList)) {
+ return respVO;
+ }
+ qcImportHelper.startImport();
+ Map<String, Integer> firstRowNoByKey = new HashMap<>();
+ for (int i = 0; i < importList.size(); i++) {
+ MesQcIqcImportExcelVO row = importList.get(i);
+ if (isImportRowEmpty(row)) {
+ continue; // 璺宠繃绌鸿
+ }
+ String label = StrUtil.isNotBlank(row.getCode()) ? "妫�楠屽崟缂栧彿 " + row.getCode().trim()
+ : "绗� " + (i + 2) + " 琛�";
+ String importKey = buildImportKey(row);
+ try {
+ Integer firstRowNo = firstRowNoByKey.get(importKey);
+ if (firstRowNo != null) {
+ throw MesQcImportHelper.duplicateRowException(firstRowNo, buildImportKeyDesc(row));
+ }
+ respVO.getCreateList().add(createIqcByImport(row));
+ firstRowNoByKey.putIfAbsent(importKey, i + 2);
+ } catch (Exception ex) {
+ respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
+ }
+ }
+ return respVO;
+ }
+
+ private boolean isImportRowEmpty(MesQcIqcImportExcelVO row) {
+ return row == null || (StrUtil.isBlank(row.getCode()) && StrUtil.isBlank(row.getName())
+ && StrUtil.isBlank(row.getItemCode()) && StrUtil.isBlank(row.getVendorName())
+ && StrUtil.isBlank(row.getVendorBatch()) && StrUtil.isBlank(row.getTemplateName())
+ && row.getReceivedQuantity() == null && row.getQualifiedQuantity() == null
+ && row.getUnqualifiedQuantity() == null && StrUtil.isBlank(row.getCheckResult())
+ && StrUtil.isBlank(row.getInspectorName()) && StrUtil.isBlank(row.getInspectDate())
+ && StrUtil.isBlank(row.getReceiveDate()) && StrUtil.isBlank(row.getRemark()));
+ }
+
+ /**
+ * 渚濇嵁瀵煎叆琛屽垱寤轰竴寮犳潵鏂欐楠屽崟锛氱姸鎬佷负銆屽緟妫�楠屻�嶏紝妫�楠岃鐢辫川妫�鏂规鑷姩鐢熸垚
+ *
+ * @return 妫�楠屽崟缂栧彿
+ */
+ private String createIqcByImport(MesQcIqcImportExcelVO row) {
+ MesQcIqcSaveReqVO reqVO = new MesQcIqcSaveReqVO();
+ // 1. 妫�楠屽崟缂栧彿锛氬～鍐欏垯浣跨敤锛岀暀绌鸿嚜鍔ㄧ敓鎴�
+ String code = StrUtil.isNotBlank(row.getCode()) ? row.getCode().trim()
+ : qcImportHelper.generateCode(MesMdAutoCodeRuleCodeEnum.QC_IQC_CODE.getCode());
+ if (iqcMapper.selectByCode(code) != null) {
+ throw new IllegalArgumentException("妫�楠屽崟缂栧彿宸插瓨鍦細" + code
+ + "銆傝淇敼妯℃澘涓殑銆屾楠屽崟缂栧彿銆嶏紝鎴栧厛鍦ㄧ郴缁熶腑鍒犻櫎璇ョ紪鍙风殑妫�楠屽崟鍚庨噸鏂板鍏�");
+ }
+ reqVO.setCode(code);
+ // 2. 鍚嶇О銆佺墿鏂欍�佷緵搴斿晢銆佽川妫�鏂规
+ if (StrUtil.isBlank(row.getName())) {
+ throw new IllegalArgumentException("妫�楠屽崟鍚嶇О涓嶈兘涓虹┖锛氳濉啓妯℃澘涓琛岀殑銆屾楠屽崟鍚嶇О銆嶅垪");
+ }
+ reqVO.setName(row.getName().trim());
+ reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
+ reqVO.setVendorId(qcImportHelper.resolveVendorId(row.getVendorName()));
+ reqVO.setVendorBatch(StrUtil.trimToNull(row.getVendorBatch()));
+ reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
+ // 3. 鏁伴噺锛氬悎鏍煎搧 + 涓嶅悎鏍煎搧 蹇呴』绛変簬鏈鎺ユ敹鏁伴噺锛堟帴鏀舵暟閲忕暀绌哄垯鑷姩鍚堣锛�
+ BigDecimal qualified = qcImportHelper.resolveQuantity(row.getQualifiedQuantity(), "鍚堟牸鍝佹暟閲�", true);
+ BigDecimal unqualified = qcImportHelper.resolveQuantity(row.getUnqualifiedQuantity(), "涓嶅悎鏍煎搧鏁伴噺", true);
+ reqVO.setQualifiedQuantity(qualified);
+ reqVO.setUnqualifiedQuantity(unqualified);
+ reqVO.setReceivedQuantity(qcImportHelper.resolveCheckQuantity(
+ row.getReceivedQuantity(), qualified, unqualified, "鏈鎺ユ敹鏁伴噺"));
+ // 4. 妫�楠屼俊鎭�
+ reqVO.setCheckResult(qcImportHelper.resolveDictValue(row.getCheckResult(),
+ DictTypeConstants.MES_QC_CHECK_RESULT, "妫�娴嬬粨鏋�", false));
+ reqVO.setInspectorUserId(qcImportHelper.resolveInspectorUserId(row.getInspectorName()));
+ reqVO.setInspectDate(qcImportHelper.parseRequiredDateTime(row.getInspectDate(), "妫�娴嬫棩鏈�"));
+ reqVO.setReceiveDate(qcImportHelper.parseRequiredDateTime(row.getReceiveDate(), "鏉ユ枡鏃ユ湡"));
+ reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
+ // 5. 鍘婚噸锛氬悓涓� 鐗╂枡 + 渚涘簲鍟� + 渚涘簲鍟嗘壒娆� + 鏉ユ枡鏃ユ湡 鐨勬潵鏂欐楠屽崟涓嶅彲閲嶅瀵煎叆
+ MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorId(),
+ reqVO.getVendorBatch(), reqVO.getReceiveDate()));
+ if (duplicate != null) {
+ throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "鏉ユ枡妫�楠屽崟",
+ duplicate.getCode(), "璐ㄩ噺绠＄悊-鏉ユ枡妫�楠�");
+ }
+ // 6. 澶嶇敤鍒涘缓閫昏緫锛氭牎楠岀墿鏂�/渚涘簲鍟�/浜哄憳銆佹寜鐗╂枡鍖归厤璐ㄦ鏂规銆佺敓鎴愭楠岃
+ try {
+ createIqc(reqVO);
+ } catch (ServiceException ex) {
+ MesQcImportHelper.rethrowTemplateError(ex, row.getItemCode(), "鏉ユ枡妫�楠�(IQC)");
+ }
+ return code;
+ }
+
+ /**
+ * 瀵煎叆鍘婚噸閿細鍚屼竴 鐗╂枡 + 渚涘簲鍟� + 渚涘簲鍟嗘壒娆� + 鏉ユ枡鏃ユ湡 瑙嗕负鍚屼竴鎵规潵鏂欐暟鎹�
+ */
+ private String buildImportKey(MesQcIqcImportExcelVO row) {
+ return String.join("|", StrUtil.trimToEmpty(row.getItemCode()), StrUtil.trimToEmpty(row.getVendorName()),
+ StrUtil.trimToEmpty(row.getVendorBatch()), StrUtil.trimToEmpty(row.getReceiveDate()));
+ }
+
+ private String buildImportKeyDesc(MesQcIqcImportExcelVO row) {
+ return "鐗╂枡[" + MesQcImportHelper.describeImportValue(row.getItemCode())
+ + "]銆佷緵搴斿晢[" + MesQcImportHelper.describeImportValue(row.getVendorName())
+ + "]銆佷緵搴斿晢鎵规[" + MesQcImportHelper.describeImportValue(row.getVendorBatch())
+ + "]銆佹潵鏂欐棩鏈焄" + MesQcImportHelper.describeImportValue(row.getReceiveDate()) + "]";
+ }
+
}
--
Gitblit v1.9.3