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/maintenanceplan/MesProMaintenancePlanServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 4 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..d0b58fb 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;
@@ -220,8 +226,7 @@
}
// 3. 缁勮宸ュ崟
MesProWorkOrderSaveReqVO workOrderReq = new MesProWorkOrderSaveReqVO();
- workOrderReq.setCode(autoCodeRecordService.generateAutoCode(
- MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode()));
+ workOrderReq.setCode(generateWorkOrderCode());
workOrderReq.setName(plan.getName());
workOrderReq.setType(convertPlanTypeToWorkOrderType(plan.getPlanType()));
workOrderReq.setOrderSourceType(MesProWorkOrderSourceTypeEnum.MAINTENANCE_PLAN.getType());
@@ -236,6 +241,70 @@
updateObj.setWorkOrderId(workOrderId);
planMapper.updateById(updateObj);
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;
}
/**
@@ -271,8 +340,30 @@
}
private String generatePlanCode() {
- return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
- + String.format("%03d", (int) (Math.random() * 1000));
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("[generatePlanCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode(), e);
+ return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
+ }
+
+ /**
+ * 鐢熸垚宸ュ崟缂栫爜
+ *
+ * 浼樺厛浣跨敤缂栫爜瑙勫垯锛涜嫢鐜涓湭閰嶇疆 PRO_WORK_ORDER_CODE 瑙勫垯锛屽垯闄嶇骇涓烘椂闂存埑缂栫爜锛岄伩鍏嶇敓鎴愬伐鍗曡闃绘柇
+ */
+ private String generateWorkOrderCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode(), e);
+ return "WO" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
}
private MesProMaintenancePlanDO validatePlanExists(Long id) {
--
Gitblit v1.9.3