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/wm/warehouse/MesWmWarehouseAreaServiceImpl.java | 129 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
index 33a7a47..862d5c4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java
@@ -3,14 +3,20 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.wm.warehouse.vo.area.MesWmWarehouseAreaImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseAreaMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseLocationMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseMapper;
import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
@@ -18,11 +24,15 @@
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.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -36,6 +46,12 @@
@Resource
private MesWmWarehouseAreaMapper areaMapper;
+
+ @Resource
+ private MesWmWarehouseMapper warehouseMapper;
+
+ @Resource
+ private MesWmWarehouseLocationMapper locationMapper;
@Resource
@Lazy
@@ -238,4 +254,117 @@
return null;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmWarehouseAreaImportRespVO importWarehouseAreaList(List<MesWmWarehouseAreaImportExcelVO> importList, boolean updateSupport) {
+ // 鏍￠獙瀵煎叆鏁版嵁涓嶈兘涓虹┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_WAREHOUSE_AREA_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmWarehouseAreaImportRespVO respVO = MesWmWarehouseAreaImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ // 绱㈠紩锛岀敤浜庨敊璇彁绀�
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String code = importItem.getCode();
+ String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+ // 鏍￠獙缂栫爜蹇呭～
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put(key, "搴撲綅缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ // 鏍￠獙鍚嶇О蹇呭～
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "搴撲綅鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ // 鏍￠獙铏氭嫙搴撲綅涓嶅厑璁稿鍏�
+ if (MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA.equals(code)) {
+ respVO.getFailureCodes().put(key, "铏氭嫙搴撲綅涓嶅厑璁稿鍏�");
+ return;
+ }
+ // 鎸夊悕绉拌В鏋愭墍灞炰粨搴�
+ if (StrUtil.isBlank(importItem.getWarehouseName())) {
+ respVO.getFailureCodes().put(key, "鎵�灞炰粨搴撲笉鑳戒负绌�");
+ return;
+ }
+ MesWmWarehouseDO warehouse = warehouseMapper.selectByName(importItem.getWarehouseName());
+ if (warehouse == null) {
+ respVO.getFailureCodes().put(key, "浠撳簱涓嶅瓨鍦細" + importItem.getWarehouseName());
+ return;
+ }
+ // 鎸夊悕绉拌В鏋愭墍灞炲簱鍖�
+ if (StrUtil.isBlank(importItem.getLocationName())) {
+ respVO.getFailureCodes().put(key, "鎵�灞炲簱鍖轰笉鑳戒负绌�");
+ return;
+ }
+ MesWmWarehouseLocationDO location = locationMapper.selectByName(warehouse.getId(), importItem.getLocationName());
+ if (location == null) {
+ respVO.getFailureCodes().put(key, "搴撳尯涓嶅瓨鍦細" + importItem.getLocationName());
+ return;
+ }
+ Long locationId = location.getId();
+ MesWmWarehouseAreaDO existingByCode = areaMapper.selectByCode(locationId, code);
+ MesWmWarehouseAreaDO existingByName = areaMapper.selectByName(locationId, importItem.getName());
+ if (existingByCode != null && updateSupport) {
+ // 鍚嶇О鍞竴鏍￠獙锛堟帓闄よ嚜宸憋級
+ if (existingByName != null && !existingByCode.getId().equals(existingByName.getId())) {
+ respVO.getFailureCodes().put(key, "搴撲綅鍚嶇О宸插瓨鍦細" + importItem.getName());
+ return;
+ }
+ // 鏇存柊
+ MesWmWarehouseAreaDO updateObj = new MesWmWarehouseAreaDO();
+ updateObj.setId(existingByCode.getId());
+ updateObj.setName(importItem.getName());
+ updateObj.setLocationId(locationId);
+ updateObj.setType(importItem.getType());
+ updateObj.setArea(importItem.getArea());
+ updateObj.setMaxLoad(importItem.getMaxLoad());
+ updateObj.setPositionX(importItem.getPositionX());
+ updateObj.setPositionY(importItem.getPositionY());
+ updateObj.setPositionZ(importItem.getPositionZ());
+ updateObj.setStatus(importItem.getStatus());
+ updateObj.setFrozen(importItem.getFrozen());
+ updateObj.setAllowItemMixing(importItem.getAllowItemMixing());
+ updateObj.setAllowBatchMixing(importItem.getAllowBatchMixing());
+ updateObj.setRemark(importItem.getRemark());
+ areaMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existingByCode != null) {
+ respVO.getFailureCodes().put(key, "搴撲綅缂栫爜宸插瓨鍦細" + code);
+ } else {
+ // 鍚嶇О鍞竴鏍￠獙
+ if (existingByName != null) {
+ respVO.getFailureCodes().put(key, "搴撲綅鍚嶇О宸插瓨鍦細" + importItem.getName());
+ return;
+ }
+ // 鍒涘缓
+ MesWmWarehouseAreaDO createObj = new MesWmWarehouseAreaDO();
+ createObj.setId(null);
+ createObj.setCode(code);
+ createObj.setName(importItem.getName());
+ createObj.setLocationId(locationId);
+ createObj.setType(importItem.getType());
+ createObj.setArea(importItem.getArea());
+ createObj.setMaxLoad(importItem.getMaxLoad());
+ createObj.setPositionX(importItem.getPositionX());
+ createObj.setPositionY(importItem.getPositionY());
+ createObj.setPositionZ(importItem.getPositionZ());
+ createObj.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
+ createObj.setFrozen(ObjUtil.defaultIfNull(importItem.getFrozen(), Boolean.FALSE));
+ createObj.setAllowItemMixing(ObjUtil.defaultIfNull(importItem.getAllowItemMixing(), Boolean.TRUE));
+ createObj.setAllowBatchMixing(ObjUtil.defaultIfNull(importItem.getAllowBatchMixing(), Boolean.TRUE));
+ createObj.setRemark(importItem.getRemark());
+ areaMapper.insert(createObj);
+ // 鑷姩鐢熸垚鏉＄爜
+ barcodeService.autoGenerateBarcode(BarcodeBizTypeEnum.AREA.getValue(),
+ createObj.getId(), createObj.getCode(), createObj.getName());
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3