From c6eb0d852595f235b21520dab1d8600ed1b80776 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 14:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 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 2b7ddd6..975ddc0 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,16 @@
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.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -42,7 +46,7 @@
/**
* MES 鏉ユ枡妫�楠屽崟锛圛QC锛� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -62,7 +66,7 @@
@Resource
private MesWmOutsourceReceiptService outsourceReceiptService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesMdItemService itemService;
@Resource
@@ -72,6 +76,13 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MdmItemApi mdmItemApi;
+
+ @Resource
+ @Lazy
+ private MesQcNcrService ncrService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
@@ -80,9 +91,21 @@
// 1.2 鏍￠獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 1.3 閫氳繃 itemId + IQC 绫诲瀷鑷姩鏌ユ壘妯℃澘
- MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- createReqVO.getItemId(), MesQcTypeEnum.IQC.getType());
+ // 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. 鎻掑叆涓昏〃
@@ -117,9 +140,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 +168,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 +216,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 +368,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 +407,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