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/outsourcetest/MesQcOutsourceTestServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
index 6911ad6..b4a2217 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
@@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.mes.service.qc.outsourcetest;
+import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@@ -8,6 +9,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest.vo.MesQcOutsourceTestSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.outsourcetest.MesQcOutsourceTestDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.outsourcetest.MesQcOutsourceTestMapper;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +24,13 @@
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.outsourcetest.vo.MesQcOutsourceTestImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest.vo.MesQcOutsourceTestImportRespVO;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 濮斿妫�娴�/璇曢獙鍗� Service 瀹炵幇绫�
@@ -56,11 +67,17 @@
@Resource
private MesQcOutsourceTestMapper testMapper;
@Resource
+ private MesMdItemService itemService;
+ @Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createTest(MesQcOutsourceTestSaveReqVO createReqVO) {
+ // 0. 鏍￠獙妫�娴嬪璞★紙鐗╂枡锛夊瓨鍦�
+ validateItemIfPresent(createReqVO.getItemId());
// 1. 鐢熸垚鍗曞彿
String code = generateCode();
if (testMapper.selectByCode(code) != null) {
@@ -80,8 +97,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTest(MesQcOutsourceTestSaveReqVO updateReqVO) {
- // 1. 鏍￠獙瀛樺湪 + 鑽夌
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌 + 妫�娴嬪璞★紙鐗╂枡锛夊瓨鍦�
MesQcOutsourceTestDO oldTest = validateTestCanModify(updateReqVO.getId());
+ validateItemIfPresent(updateReqVO.getItemId());
// 2. 鏇存柊
MesQcOutsourceTestDO updateObj = BeanUtils.toBean(updateReqVO, MesQcOutsourceTestDO.class, req -> req
.setCode(oldTest.getCode())
@@ -134,9 +152,21 @@
testMapper.updateById(new MesQcOutsourceTestDO().setId(id).setStatus(STATUS_FINISHED));
}
+ private void validateItemIfPresent(Long itemId) {
+ if (itemId != null) {
+ itemService.validateItemExists(itemId);
+ }
+ }
+
private String generateCode() {
- return "WT" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
- + String.format("%03d", (int) (Math.random() * 1000));
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.QC_OUTSOURCE_TEST_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("濮斿妫�娴嬬紪鐮佽鍒� {} 涓嶅彲鐢紝闄嶇骇浣跨敤鏃堕棿鎴崇紪鐮�",
+ MesMdAutoCodeRuleCodeEnum.QC_OUTSOURCE_TEST_CODE.getCode(), e);
+ return "WT" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
}
private MesQcOutsourceTestDO validateTestExists(Long id) {
@@ -155,4 +185,51 @@
return test;
}
+
+ @Override
+ public MesQcOutsourceTestImportRespVO importTestList(List<MesQcOutsourceTestImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_OUTSOURCE_TEST_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcOutsourceTestImportRespVO respVO = MesQcOutsourceTestImportRespVO.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.getName())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getTestType() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬬被鍨嬩笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getTestDate() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
+ return;
+ }
+ Long itemId = null;
+ if (StrUtil.isNotBlank(importItem.getItemCode())) {
+ cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
+ return;
+ }
+ itemId = item.getId();
+ }
+ try {
+ MesQcOutsourceTestSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcOutsourceTestSaveReqVO.class);
+ createReqVO.setItemId(itemId);
+ Long id = createTest(createReqVO);
+ MesQcOutsourceTestDO created = testMapper.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;
+ }
+
}
--
Gitblit v1.9.3