From 71b15a5c69dcc421bad71d558e191e12cb7bae3e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 13 八月 2026 10:18:54 +0800
Subject: [PATCH] 其他模块引用供应商时，限制不能删除，给出提示
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 123 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 14 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index ba304b9..57b4dd2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -13,15 +13,18 @@
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
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.productsales.MesWmProductSalesLineService;
+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.mes.service.wm.productsales.MesWmProductSalesService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+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;
@@ -40,7 +43,7 @@
/**
* MES 鍑鸿揣妫�楠屽崟锛圤QC锛� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -58,12 +61,6 @@
private MesQcDefectRecordService defectRecordService;
@Resource
@Lazy
- private MesMdClientService clientService;
- @Resource
- @Lazy
- private MesMdItemService itemService;
- @Resource
- @Lazy
private MesWmProductSalesLineService productSalesLineService;
@Resource
@Lazy
@@ -74,6 +71,14 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private CrmCustomerApi customerApi;
+
+ @Resource
+ @Lazy
+ private MesQcNcrService ncrService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -118,9 +123,9 @@
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateOqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙瀹㈡埛銆佺墿鏂欍�佹娴嬩汉鍛樺瓨鍦�
- clientService.validateClientExists(reqVO.getClientId());
- itemService.validateItemExists(reqVO.getItemId());
+ // 鏍￠獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦�
+ // 娉細鐗╂枡 ID 鏉ヨ嚜 MDM锛屽鎴� ID 鏉ヨ嚜 CRM
+ mdmItemApi.validateItemExists(reqVO.getItemId());
adminUserApi.validateUser(reqVO.getInspectorUserId());
}
@@ -141,8 +146,34 @@
.setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
oqcMapper.updateById(updateObj);
- // 3. 鍥炲啓鏉ユ簮鍗曟嵁
+ // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
+ generateNcrIfNeeded(oqc);
+
+ // 4. 鍥炲啓鏉ユ簮鍗曟嵁
writeBackSourceDoc(oqc);
+ }
+
+ /**
+ * 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR锛堜笉鍚堟牸鍝佸鐞嗗崟锛�
+ *
+ * @param oqc 鍑鸿揣妫�楠屽崟
+ */
+ private void generateNcrIfNeeded(MesQcOqcDO oqc) {
+ BigDecimal unqualifiedQty = oqc.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.OQC.getType());
+ saveReqVO.setQcId(oqc.getId());
+ saveReqVO.setItemId(oqc.getItemId());
+ saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
+ saveReqVO.setDefectDescription("鐢卞嚭璐ф楠�(" + oqc.getCode() + ")鑷姩鐢熸垚");
+ ncrService.createNcr(saveReqVO);
}
/**
@@ -246,7 +277,9 @@
@Override
public PageResult<MesQcOqcDO> getOqcPage(MesQcOqcPageReqVO pageReqVO) {
- return oqcMapper.selectPage(pageReqVO);
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return oqcMapper.selectPage(pageReqVO, permittedClientIds);
}
@Override
@@ -289,4 +322,66 @@
oqcMapper.updateById(updateOqc);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
+ // 1. 鏍￠獙鐗╂枡鏄惁閰嶇疆浜� OQC 妫�楠屾ā鏉�
+ MesQcTemplateItemDO templateItem;
+ try {
+ templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
+ line.getItemId(), MesQcTypeEnum.OQC.getType());
+ } catch (Exception e) {
+ // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
+ String itemInfo = getItemInfo(line.getItemId());
+ throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
+ }
+ Long templateId = templateItem.getTemplateId();
+
+ // 2. 鐢熸垚妫�楠屽崟缂栫爜
+ String code = "OQC" + System.currentTimeMillis();
+
+ // 3. 鍒涘缓 OQC 涓昏〃锛堝緟妫�楠岀姸鎬侊紝鍒濆鏁伴噺涓� 0锛�
+ MesQcOqcDO oqc = new MesQcOqcDO();
+ oqc.setCode(code);
+ oqc.setName(salesCode + "-鍑鸿揣妫�楠�");
+ oqc.setTemplateId(templateId);
+ oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
+ oqc.setSourceDocId(salesId);
+ oqc.setSourceLineId(line.getId());
+ oqc.setSourceDocCode(salesCode);
+ oqc.setClientId(clientId);
+ oqc.setItemId(line.getItemId());
+ oqc.setBatchCode(line.getBatchCode());
+ oqc.setOutQuantity(line.getQuantity());
+ oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+ oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+ oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
+ oqc.setOutDate(java.time.LocalDateTime.now());
+ oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+ oqcMapper.insert(oqc);
+
+ // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
+ oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
+
+ return oqc.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