From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 70 +++++++++++++---------------------
1 files changed, 27 insertions(+), 43 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 b62ec2d..93efc25 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
@@ -63,6 +63,9 @@
public class MesQcIqcServiceImpl implements MesQcIqcService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+ @Resource
private MesQcIqcMapper iqcMapper;
@Resource
@@ -104,33 +107,15 @@
// 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);
- 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. 鎻掑叆涓昏〃
MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity()))
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
return iqc.getId();
}
@@ -151,11 +136,18 @@
}
private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
+ // 绌哄瓧绗︿覆涔熼渶瑕佸啓鍏ワ紝浠ユ敮鎸佺紪杈戞椂娓呯┖鎵嬪～鍚嶇О銆�
+ if (reqVO.getVendorName() != null) {
+ reqVO.setVendorName(reqVO.getVendorName().trim());
+ }
// 鏍￠獙缂栧彿鍞竴
validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
// 鏍￠獙渚涘簲鍟嗗瓨鍦�
if (reqVO.getVendorId() != null) {
- srmSupplierApi.getSupplier(reqVO.getVendorId());
+ var supplier = srmSupplierApi.getSupplier(reqVO.getVendorId()).getCheckedData();
+ if (reqVO.getVendorName() == null && supplier != null) {
+ reqVO.setVendorName(supplier.getName());
+ }
}
// 鏍￠獙鐗╂枡瀛樺湪锛堜娇鐢� MDM 鐗╂枡锛�
if (reqVO.getItemId() != null) {
@@ -168,17 +160,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishIqc(Long id) {
+ completionHelper.lockDocument("iqc", id);
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
MesQcIqcDO iqc = validateIqcStatusPrepare(id);
- if (iqc.getCheckResult() == null) {
- throw exception(QC_IQC_CHECK_RESULT_EMPTY);
- }
- // 1.2 鏍￠獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IQC.getType());
+ int result = completionHelper.validateAndGetResult("iqc", id, iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity(), iqc.getCheckQuantity());
+ iqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
MesQcIqcDO updateObj = new MesQcIqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
iqcMapper.updateById(updateObj);
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
@@ -380,17 +371,6 @@
@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();
// 2. 鐢熸垚妫�楠屽崟缂栫爜
String code = "IQC" + System.currentTimeMillis();
@@ -399,12 +379,18 @@
MesQcIqcDO iqc = new MesQcIqcDO();
iqc.setCode(code);
iqc.setName(noticeCode + "-鐗╂枡妫�楠�");
- iqc.setTemplateId(templateId);
+
iqc.setSourceDocType(MesBizTypeConstants.WM_ARRIVAL_NOTICE);
iqc.setSourceDocId(noticeId);
iqc.setSourceLineId(line.getId());
iqc.setSourceDocCode(noticeCode);
iqc.setVendorId(vendorId);
+ if (vendorId != null) {
+ var supplier = srmSupplierApi.getSupplier(vendorId).getCheckedData();
+ if (supplier != null) {
+ iqc.setVendorName(supplier.getName());
+ }
+ }
iqc.setItemId(line.getItemId());
iqc.setReceivedQuantity(line.getArrivalQuantity());
iqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
@@ -414,8 +400,6 @@
iqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
- // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
return iqc.getId();
}
@@ -507,7 +491,7 @@
}
reqVO.setName(row.getName().trim());
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
- reqVO.setVendorId(qcImportHelper.resolveVendorId(row.getVendorName()));
+ reqVO.setVendorName(StrUtil.trimToEmpty(row.getVendorName()));
reqVO.setVendorBatch(StrUtil.trimToNull(row.getVendorBatch()));
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
// 3. 鏁伴噺锛氬悎鏍煎搧 + 涓嶅悎鏍煎搧 蹇呴』绛変簬鏈鎺ユ敹鏁伴噺锛堟帴鏀舵暟閲忕暀绌哄垯鑷姩鍚堣锛�
@@ -525,7 +509,7 @@
reqVO.setReceiveDate(qcImportHelper.parseRequiredDateTime(row.getReceiveDate(), "鏉ユ枡鏃ユ湡"));
reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
// 5. 鍘婚噸锛氬悓涓� 鐗╂枡 + 渚涘簲鍟� + 渚涘簲鍟嗘壒娆� + 鏉ユ枡鏃ユ湡 鐨勬潵鏂欐楠屽崟涓嶅彲閲嶅瀵煎叆
- MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorId(),
+ MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorName(),
reqVO.getVendorBatch(), reqVO.getReceiveDate()));
if (duplicate != null) {
throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "鏉ユ枡妫�楠屽崟",
--
Gitblit v1.9.3