From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java
index b280225..88e71c1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java
@@ -1,11 +1,17 @@
package cn.iocoder.yudao.module.mes.service.pro.card;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.card.vo.MesProCardImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.card.vo.MesProCardImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.card.vo.MesProCardPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.card.vo.MesProCardSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.card.MesProCardDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.card.MesProCardMapper;
@@ -19,6 +25,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -130,6 +141,67 @@
.setId(id).setStatus(MesProWorkOrderStatusEnum.CANCELED.getStatus()));
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProCardImportRespVO importCardList(List<MesProCardImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_CARD_IMPORT_LIST_IS_EMPTY);
+ }
+ MesProCardImportRespVO respVO = MesProCardImportRespVO.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 = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "娴佽浆鍗＄紪鐮佷笉鑳戒负绌�");
+ return;
+ }
+ // 1. 瑙ｆ瀽鐢熶骇宸ュ崟
+ Long workOrderId = null;
+ if (StrUtil.isNotBlank(importItem.getWorkOrderCode())) {
+ MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(importItem.getWorkOrderCode().trim());
+ if (workOrder == null) {
+ respVO.getFailureCodes().put(key, "鐢熶骇宸ュ崟缂栫爜[" + importItem.getWorkOrderCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ workOrderId = workOrder.getId();
+ }
+ // 2. 瑙ｆ瀽浜у搧鐗╂枡
+ Long itemId = null;
+ if (StrUtil.isNotBlank(importItem.getItemCode())) {
+ MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode().trim());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "浜у搧鐗╂枡缂栫爜[" + importItem.getItemCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ itemId = item.getId();
+ }
+ // 3. 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢ㄧ幇鏈� create/update 鏈嶅姟锛屼繚鐣欐潯鐮佺敓鎴愰�昏緫锛�
+ MesProCardSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProCardSaveReqVO.class);
+ reqVO.setWorkOrderId(workOrderId);
+ reqVO.setItemId(itemId);
+ MesProCardDO existCard = cardMapper.selectByCode(importItem.getCode());
+ try {
+ if (existCard == null) {
+ reqVO.setId(null);
+ createCard(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existCard.getId());
+ updateCard(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "娴佽浆鍗＄紪鐮佸凡瀛樺湪");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
// ==================== 鏍￠獙鏂规硶 ====================
@Override
--
Gitblit v1.9.3