From 85156554438bb13930c89072ee0b7fa93192a7fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 七月 2026 17:43:30 +0800
Subject: [PATCH] 1.联调优化采购申请到入库的整个逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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..6c5f535 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
@@ -23,6 +23,8 @@
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.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -72,6 +74,13 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MdmItemApi mdmItemApi;
+
+ @Resource
+ @Lazy
+ private ErpSupplierApi supplierApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
@@ -117,9 +126,20 @@
private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙渚涘簲鍟嗐�佺墿鏂欍�佹娴嬩汉鍛樺瓨鍦�
- vendorService.validateVendorExists(reqVO.getVendorId());
- itemService.validateItemExists(reqVO.getItemId());
+ // 鏍￠獙渚涘簲鍟嗗瓨鍦紙浼樺厛鏍￠獙 ERP 渚涘簲鍟嗭紝澶辫触鍒欐牎楠� MDM 渚涘簲鍟嗭級
+ if (reqVO.getVendorId() != null) {
+ try {
+ supplierApi.validateSupplier(reqVO.getVendorId());
+ } catch (Exception e) {
+ // ERP 渚涘簲鍟嗘牎楠屽け璐ワ紝灏濊瘯 MDM 渚涘簲鍟�
+ vendorService.validateVendorExists(reqVO.getVendorId());
+ }
+ }
+ // 鏍￠獙鐗╂枡瀛樺湪锛堜娇鐢� MDM 鐗╂枡锛�
+ if (reqVO.getItemId() != null) {
+ mdmItemApi.getItem(reqVO.getItemId()).getCheckedData();
+ }
+ // 鏍￠獙妫�娴嬩汉鍛樺瓨鍦�
adminUserApi.validateUser(reqVO.getInspectorUserId());
}
@@ -161,7 +181,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 +333,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 +372,22 @@
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;
+ }
+
}
--
Gitblit v1.9.3