From 555a0724a2d62c6fb2faa9bf7abc57cd241880e6 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 19 十月 2026 13:10:16 +0800
Subject: [PATCH] fix(mes): 修复归档台账导出提示系统异常
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
index 2ab5372..7887f2e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
@@ -2,10 +2,14 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+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.erp.api.purchase.PurchasePlanApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchasePlanCreateReqDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.maintenanceplan.vo.MesProMaintenancePlanImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.maintenanceplan.vo.MesProMaintenancePlanImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.maintenanceplan.vo.MesProMaintenancePlanPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.maintenanceplan.vo.MesProMaintenancePlanSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
@@ -29,7 +33,9 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -238,6 +244,70 @@
return workOrderId;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProMaintenancePlanImportRespVO importPlanList(List<MesProMaintenancePlanImportExcelVO> importList,
+ boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_MAINTENANCE_PLAN_IMPORT_LIST_IS_EMPTY);
+ }
+ MesProMaintenancePlanImportRespVO respVO = MesProMaintenancePlanImportRespVO.builder()
+ .createNames(new ArrayList<>()).updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>()).build();
+ // 1. 鎸夎鍒掑悕绉板垎缁勶紙鍚屼竴璁″垝鍚嶇О鐨勫琛屽悎骞朵负涓�涓鍒掞紝姣忚涓�鏉″浠�/鐗╄祫鏄庣粏锛�
+ int rowIndex = 1;
+ Map<String, List<MesProMaintenancePlanImportExcelVO>> groupMap = new LinkedHashMap<>();
+ for (MesProMaintenancePlanImportExcelVO item : importList) {
+ if (StrUtil.isBlank(item.getName())) {
+ respVO.getFailureNames().put("绗� " + rowIndex + " 琛�", "璁″垝鍚嶇О涓嶈兘涓虹┖");
+ rowIndex++;
+ continue;
+ }
+ groupMap.computeIfAbsent(item.getName(), k -> new ArrayList<>()).add(item);
+ rowIndex++;
+ }
+ // 2. 閫愮粍澶勭悊
+ groupMap.forEach((name, rows) -> {
+ MesProMaintenancePlanImportExcelVO main = rows.get(0);
+ List<MesProMaintenancePlanSaveReqVO.Item> items = new ArrayList<>();
+ for (MesProMaintenancePlanImportExcelVO row : rows) {
+ if (StrUtil.isBlank(row.getItemCode())) {
+ respVO.getFailureNames().put(name, "鐗╂枡/澶囦欢缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ MesMdItemDO item = itemService.getItemByCode(row.getItemCode().trim());
+ if (item == null) {
+ respVO.getFailureNames().put(name, "鐗╂枡/澶囦欢缂栫爜[" + row.getItemCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ MesProMaintenancePlanSaveReqVO.Item it = new MesProMaintenancePlanSaveReqVO.Item();
+ it.setItemId(item.getId());
+ it.setQuantity(row.getItemQuantity());
+ it.setRemark(row.getItemRemark());
+ items.add(it);
+ }
+ MesProMaintenancePlanSaveReqVO reqVO = BeanUtils.toBean(main, MesProMaintenancePlanSaveReqVO.class);
+ reqVO.setItems(items);
+ MesProMaintenancePlanDO existPlan = planMapper.selectByName(name);
+ try {
+ if (existPlan == null) {
+ reqVO.setId(null);
+ createPlan(reqVO);
+ respVO.getCreateNames().add(name);
+ } else if (updateSupport) {
+ reqVO.setId(existPlan.getId());
+ updatePlan(reqVO);
+ respVO.getUpdateNames().add(name);
+ } else {
+ respVO.getFailureNames().put(name, "璁″垝鍚嶇О宸插瓨鍦�");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureNames().put(name, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
/**
* 璁″垝绫诲瀷 -> 宸ュ崟绫诲瀷鏄犲皠
*/
--
Gitblit v1.9.3