From 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 23:41:23 +0800
Subject: [PATCH] fix(mes): 修复批次正反向追溯链路
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 151 insertions(+), 10 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 2b7ddd6..511bbe4 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
@@ -17,12 +17,17 @@
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
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.vendor.MesMdVendorService;
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.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;
+import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -38,11 +43,20 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcImportRespVO;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.date.DateUtil;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 鏉ユ枡妫�楠屽崟锛圛QC锛� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -62,7 +76,7 @@
@Resource
private MesWmOutsourceReceiptService outsourceReceiptService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesMdItemService itemService;
@Resource
@@ -71,6 +85,13 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+
+ @Resource
+ @Lazy
+ private MesQcNcrService ncrService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -117,9 +138,15 @@
private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗐�佺墿鏂欍�佹娴嬩汉鍛樺瓨鍦�
- vendorService.validateVendorExists(reqVO.getVendorId());
- itemService.validateItemExists(reqVO.getItemId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦�
+ if (reqVO.getVendorId() != null) {
+ srmSupplierApi.getSupplier(reqVO.getVendorId());
+ }
+ // 鏍￠獙鐗╂枡瀛樺湪锛堜娇鐢� MDM 鐗╂枡锛�
+ if (reqVO.getItemId() != null) {
+ mdmItemApi.getItem(reqVO.getItemId()).getCheckedData();
+ }
+ // 鏍￠獙妫�娴嬩汉鍛樺瓨鍦�
adminUserApi.validateUser(reqVO.getInspectorUserId());
}
@@ -139,8 +166,34 @@
.setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
iqcMapper.updateById(updateObj);
- // 3. 鍥炲啓鏉ユ簮鍗曟嵁
+ // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
+ generateNcrIfNeeded(iqc);
+
+ // 4. 鍥炲啓鏉ユ簮鍗曟嵁
writeBackSourceDoc(iqc);
+ }
+
+ /**
+ * 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR锛堜笉鍚堟牸鍝佸鐞嗗崟锛�
+ *
+ * @param iqc 鏉ユ枡妫�楠屽崟
+ */
+ private void generateNcrIfNeeded(MesQcIqcDO iqc) {
+ BigDecimal unqualifiedQty = iqc.getUnqualifiedQuantity();
+ if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ String ncrCode = "NCR" + java.time.LocalDateTime.now()
+ .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+ MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
+ saveReqVO.setCode(ncrCode);
+ saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
+ saveReqVO.setQcType(MesQcTypeEnum.IQC.getType());
+ saveReqVO.setQcId(iqc.getId());
+ saveReqVO.setItemId(iqc.getItemId());
+ saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
+ saveReqVO.setDefectDescription("鐢辨潵鏂欐楠�(" + iqc.getCode() + ")鑷姩鐢熸垚");
+ ncrService.createNcr(saveReqVO);
}
/**
@@ -161,7 +214,7 @@
// 鏍规嵁涓嶅悓鐨勬潵婧愬崟鎹被鍨嬶紝鍥炲啓涓嶅悓鐨勫崟鎹�
if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_ARRIVAL_NOTICE)) {
arrivalNoticeService.updateArrivalNoticeWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
- iqc.getId(), iqc.getQualifiedQuantity());
+ iqc.getId(), iqc.getCheckResult(), iqc.getQualifiedQuantity());
} else if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_OUTSOURCE_RECPT)) {
outsourceReceiptService.updateOutsourceReceiptWhenIqcFinish(iqc.getSourceDocId(), iqc.getSourceLineId(),
iqc.getId(), iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity());
@@ -313,8 +366,15 @@
@Transactional(rollbackFor = Exception.class)
public Long createIqcFromArrivalNotice(Long noticeId, MesWmArrivalNoticeLineDO line, String noticeCode, Long vendorId) {
// 1. 鏍￠獙鐗╂枡鏄惁閰嶇疆浜� IQC 妫�楠屾ā鏉�
- MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- line.getItemId(), MesQcTypeEnum.IQC.getType());
+ 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. 鐢熸垚妫�楠屽崟缂栫爜
@@ -345,4 +405,85 @@
return iqc.getId();
}
+ /**
+ * 鑾峰彇鐗╂枡淇℃伅锛堢紪鐮�+鍚嶇О锛�
+ */
+ private String getItemInfo(Long itemId) {
+ if (itemId == null) {
+ return "鏈煡鐗╂枡";
+ }
+ 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) {
+ // 蹇界暐寮傚父
+ }
+ return "鐗╂枡ID:" + itemId;
+ }
+
+
+ @Override
+ public MesQcIqcImportRespVO importIqcList(List<MesQcIqcImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_IQC_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcIqcImportRespVO respVO = MesQcIqcImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = "绗� " + currentIndex + " 琛�";
+ if (StrUtil.isBlank(importItem.getItemCode())) {
+ respVO.getFailureCodes().put(key, "浜у搧鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getInspectorUserId() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬩汉鍛樹笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getInspectDate() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getReceiveDate() == null) {
+ respVO.getFailureCodes().put(key, "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getReceivedQuantity() == null || importItem.getQualifiedQuantity() == null || importItem.getUnqualifiedQuantity() == null) {
+ respVO.getFailureCodes().put(key, "鏈鎺ユ敹鏁伴噺銆佸悎鏍煎搧鏁伴噺銆佷笉鍚堟牸鍝佹暟閲忓潎涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getQualifiedQuantity().add(importItem.getUnqualifiedQuantity()).compareTo(importItem.getReceivedQuantity()) != 0) {
+ respVO.getFailureCodes().put(key, "鍚堟牸鍝佹暟閲忎笌涓嶅悎鏍煎搧鏁伴噺涔嬪拰蹇呴』绛変簬鏈鎺ユ敹鏁伴噺");
+ return;
+ }
+ // 鏉ユ枡妫�楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙ｆ瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
+ return;
+ }
+ try {
+ MesQcIqcSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcIqcSaveReqVO.class);
+ createReqVO.setCode(generateImportCode("IQC", index));
+ createReqVO.setName(StrUtil.blankToDefault(importItem.getName(), "鏉ユ枡妫�楠屽崟"));
+ createReqVO.setItemId(item.getId());
+ Long id = createIqc(createReqVO);
+ MesQcIqcDO created = iqcMapper.selectById(id);
+ respVO.getCreateCodes().add(created != null && StrUtil.isNotBlank(created.getCode()) ? created.getCode() : key);
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ private String generateImportCode(String prefix, AtomicInteger seq) {
+ return prefix + DateUtil.format(LocalDateTime.now(), "yyyyMMddHHmmss")
+ + String.format("%03d", seq.incrementAndGet());
+ }
+
}
--
Gitblit v1.9.3