From 7081c41bc3beb0ab49a22974ea4b010ae6854afe Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 13:07:52 +0800
Subject: [PATCH] feat: 全量列表页补 Excel 导入接口，清理 crm/mdm 重复 FQCN 类
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index 3100498..f516574 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -3,8 +3,11 @@
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.module.mes.controller.admin.pro.mps.vo.MesProMpsImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
@@ -34,6 +37,7 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -47,8 +51,10 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -429,6 +435,73 @@
return false;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProMpsImportRespVO importMpsList(List<MesProMpsImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_MPS_IMPORT_LIST_IS_EMPTY);
+ }
+ MesProMpsImportRespVO respVO = MesProMpsImportRespVO.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 + " 琛�");
+ // 1. 瑙ｆ瀽浜у搧
+ if (StrUtil.isBlank(importItem.getProductCode())) {
+ respVO.getFailureCodes().put(key, "浜у搧缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ MesMdItemDO item = itemService.getItemByCode(importItem.getProductCode().trim());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "浜у搧缂栫爜[" + importItem.getProductCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2. 瑙ｆ瀽瀹㈡埛
+ Long clientId = null;
+ if (StrUtil.isNotBlank(importItem.getClientName())) {
+ CrmCustomerRespDTO customer = customerApi.getCustomerByName(importItem.getClientName().trim());
+ if (customer == null) {
+ respVO.getFailureCodes().put(key, "瀹㈡埛鍚嶇О[" + importItem.getClientName() + "]涓嶅瓨鍦�");
+ return;
+ }
+ clientId = customer.getId();
+ }
+ // 3. 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢ㄧ幇鏈� create/update 鏈嶅姟锛�
+ MesProMpsSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProMpsSaveReqVO.class);
+ reqVO.setProductId(item.getId());
+ reqVO.setUnitMeasureId(item.getUnitMeasureId());
+ reqVO.setClientId(clientId);
+ try {
+ if (StrUtil.isBlank(importItem.getCode())) {
+ // 缂栫爜涓虹┖锛氫粎鍒涘缓锛堣嚜鍔ㄧ敓鎴愮紪鐮侊級
+ reqVO.setId(null);
+ reqVO.setCode(null);
+ createMps(reqVO);
+ respVO.getCreateCodes().add(StrUtil.isBlank(reqVO.getCode())
+ ? String.valueOf(currentIndex) : reqVO.getCode());
+ } else {
+ MesProMpsDO existMps = mpsMapper.selectByCode(importItem.getCode());
+ if (existMps == null) {
+ reqVO.setId(null);
+ createMps(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existMps.getId());
+ updateMps(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "MPS 缂栫爜宸插瓨鍦�");
+ }
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
/**
* 鍒ゆ柇鍗曚釜 MPS 鏄惁瀹屾垚
*/
--
Gitblit v1.9.3