From bc1b16a708ca7bec89d2e1a435c023477f107a59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 12:42:04 +0800
Subject: [PATCH] feat(mes): 添加MES系统自动编码规则支持
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 2 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 78f370b..9daa2ba 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
@@ -17,11 +17,15 @@
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.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -36,15 +40,30 @@
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.oqc.vo.MesQcOqcImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportRespVO;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.collection.CollUtil;
+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
public class MesQcOqcServiceImpl implements MesQcOqcService {
+
+ @Resource
+ private MesMdItemService itemService;
@Resource
private MesQcOqcMapper oqcMapper;
@@ -72,6 +91,10 @@
private MdmItemApi mdmItemApi;
@Resource
private CrmCustomerApi customerApi;
+
+ @Resource
+ @Lazy
+ private MesQcNcrService ncrService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -139,8 +162,31 @@
.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;
+ }
+ MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
+ 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);
}
/**
@@ -351,4 +397,78 @@
return "鐗╂枡ID:" + itemId;
}
+
+ @Override
+ public MesQcOqcImportRespVO importOqcList(List<MesQcOqcImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_OQC_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcOqcImportRespVO respVO = MesQcOqcImportRespVO.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.getClientName())) {
+ respVO.getFailureCodes().put(key, "瀹㈡埛鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getItemCode())) {
+ respVO.getFailureCodes().put(key, "浜у搧鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getOutQuantity() == null || importItem.getCheckQuantity() == null
+ || importItem.getQualifiedQuantity() == null || importItem.getUnqualifiedQuantity() == null) {
+ respVO.getFailureCodes().put(key, "鍑鸿揣鏁伴噺銆佹娴嬫暟閲忋�佸悎鏍煎搧鏁伴噺銆佷笉鍚堟牸鍝佹暟閲忓潎涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getCheckQuantity().compareTo(importItem.getQualifiedQuantity().add(importItem.getUnqualifiedQuantity())) != 0) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫暟閲忓繀椤荤瓑浜庡悎鏍煎搧鏁伴噺涓庝笉鍚堟牸鍝佹暟閲忎箣鍜�");
+ return;
+ }
+ if (importItem.getInspectorUserId() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬩汉鍛樹笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getOutDate() == null) {
+ respVO.getFailureCodes().put(key, "鍑鸿揣鏃ユ湡涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getInspectDate() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
+ return;
+ }
+ cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO customer = customerApi.getCustomerByName(importItem.getClientName());
+ if (customer == null) {
+ respVO.getFailureCodes().put(key, "瀹㈡埛涓嶅瓨鍦細" + importItem.getClientName());
+ return;
+ }
+ // 鍑鸿揣妫�楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙ｆ瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
+ return;
+ }
+ try {
+ MesQcOqcSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcOqcSaveReqVO.class);
+ createReqVO.setCode(generateImportCode("OQC", index));
+ createReqVO.setName(StrUtil.blankToDefault(importItem.getName(), "鍑鸿揣妫�楠屽崟"));
+ createReqVO.setClientId(customer.getId());
+ createReqVO.setItemId(item.getId());
+ Long id = createOqc(createReqVO);
+ MesQcOqcDO created = oqcMapper.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