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/tm/tool/MesTmToolServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
index 1801e8a..2a1c653 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
@@ -1,25 +1,36 @@
package cn.iocoder.yudao.module.mes.service.tm.tool;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
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.tm.tool.vo.MesTmToolImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolTypeDO;
import cn.iocoder.yudao.module.mes.dal.mysql.tm.tool.MesTmToolMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.tm.tool.MesTmToolTypeMapper;
import cn.iocoder.yudao.module.mes.enums.tm.MesTmMaintenTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.tm.MesTmToolStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
+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.*;
@@ -35,6 +46,9 @@
@Resource
private MesTmToolMapper toolMapper;
+
+ @Resource
+ private MesTmToolTypeMapper toolTypeMapper;
@Resource
@Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧�
@@ -145,4 +159,74 @@
return toolMapper.selectByIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesTmToolImportRespVO importToolList(List<MesTmToolImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(TM_TOOL_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesTmToolImportRespVO respVO = MesTmToolImportRespVO.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;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "宸ュ叿鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getQuantity() == null) {
+ respVO.getFailureCodes().put(key, "鏁伴噺涓嶈兘涓虹┖");
+ return;
+ }
+ // 瑙ｆ瀽宸ュ叿绫诲瀷锛堟寜鍚嶇О锛�
+ Long toolTypeId = null;
+ if (StrUtil.isNotBlank(importItem.getToolTypeName())) {
+ MesTmToolTypeDO toolType = toolTypeMapper.selectByName(importItem.getToolTypeName());
+ if (toolType == null) {
+ respVO.getFailureCodes().put(key, "宸ュ叿绫诲瀷涓嶅瓨鍦細" + importItem.getToolTypeName());
+ return;
+ }
+ toolTypeId = toolType.getId();
+ }
+ // 2.1 鍒ゆ柇锛氬垱寤� or 鏇存柊
+ MesTmToolDO existTool = toolMapper.selectByCode(importItem.getCode());
+ if (existTool == null) {
+ // 2.1.1 鏂板
+ MesTmToolDO tool = BeanUtils.toBean(importItem, MesTmToolDO.class);
+ tool.setId(null);
+ tool.setToolTypeId(toolTypeId);
+ tool.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), MesTmToolStatusEnum.STORE.getStatus()));
+ tool.setAvailableQuantity(ObjUtil.defaultIfNull(importItem.getAvailableQuantity(), importItem.getQuantity()));
+ toolMapper.insert(tool);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ // 2.1.2 鏇存柊锛堜繚鍏荤被鍨嬩簰鏂ユ竻鐞嗭紝涓庢墜鍔ㄦ洿鏂颁繚鎸佷竴鑷达級
+ MesTmToolDO updateObj = BeanUtils.toBean(importItem, MesTmToolDO.class);
+ updateObj.setId(existTool.getId());
+ updateObj.setCode(existTool.getCode());
+ updateObj.setToolTypeId(toolTypeId);
+ if (Objects.equals(updateObj.getMaintenType(), MesTmMaintenTypeEnum.REGULAR.getType())) {
+ updateObj.setNextMaintenPeriod(null);
+ } else if (Objects.equals(updateObj.getMaintenType(), MesTmMaintenTypeEnum.USAGE.getType())) {
+ updateObj.setNextMaintenDate(null);
+ }
+ toolMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "宸ュ叿缂栫爜宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3