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/md/workstation/MesMdWorkstationServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
index 647177a..f9772ec 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
@@ -2,17 +2,23 @@
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.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkstationMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.process.MesProProcessMapper;
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.warehouse.MesWmWarehouseAreaService;
@@ -25,9 +31,12 @@
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.*;
@@ -35,7 +44,7 @@
/**
* MES 宸ヤ綔绔� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -53,6 +62,10 @@
private MesMdWorkstationWorkerService workstationWorkerService;
@Resource
private MesMdWorkshopService workshopService;
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+ @Resource
+ private MesProProcessMapper processMapper;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
@@ -271,4 +284,79 @@
return workstationMapper.selectByIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesMdWorkstationImportRespVO importWorkstationList(List<MesMdWorkstationImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MD_WORKSTATION_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesMdWorkstationImportRespVO respVO = MesMdWorkstationImportRespVO.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;
+ }
+ // 2.1 瑙ｆ瀽杞﹂棿
+ if (StrUtil.isBlank(importItem.getWorkshopCode())) {
+ respVO.getFailureCodes().put(key, "鎵�鍦ㄨ溅闂寸紪鐮佷笉鑳戒负绌�");
+ return;
+ }
+ MesMdWorkshopDO workshop = workshopMapper.selectByCode(importItem.getWorkshopCode());
+ if (workshop == null) {
+ respVO.getFailureCodes().put(key, "鎵�鍦ㄨ溅闂寸紪鐮乕" + importItem.getWorkshopCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2.2 瑙ｆ瀽宸ュ簭
+ if (StrUtil.isBlank(importItem.getProcessCode())) {
+ respVO.getFailureCodes().put(key, "宸ュ簭缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ MesProProcessDO process = processMapper.selectByCode(importItem.getProcessCode());
+ if (process == null) {
+ respVO.getFailureCodes().put(key, "宸ュ簭缂栫爜[" + importItem.getProcessCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2.3 鍒ゆ柇锛氬垱寤� or 鏇存柊
+ MesMdWorkstationDO existWorkstation = workstationMapper.selectByCode(importItem.getCode());
+ if (existWorkstation == null) {
+ // 2.3.1 鏂板锛堝鐢� create 鐨勪粨搴撳眰绾у鐞嗕笌鏉＄爜鐢熸垚閫昏緫锛�
+ MesMdWorkstationSaveReqVO reqVO = BeanUtils.toBean(importItem, MesMdWorkstationSaveReqVO.class);
+ reqVO.setWorkshopId(workshop.getId());
+ reqVO.setProcessId(process.getId());
+ reqVO.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
+ handleWarehouseHierarchy(reqVO);
+ MesMdWorkstationDO workstation = BeanUtils.toBean(reqVO, MesMdWorkstationDO.class);
+ workstationMapper.insert(workstation);
+ // 鑷姩鐢熸垚鏉＄爜
+ barcodeService.autoGenerateBarcode(BarcodeBizTypeEnum.WORKSTATION.getValue(),
+ workstation.getId(), workstation.getCode(), workstation.getName());
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ // 2.3.2 鏇存柊锛堜繚鐣欏師鏈夌嚎杈瑰簱灞傜骇锛�
+ MesMdWorkstationDO updateObj = BeanUtils.toBean(importItem, MesMdWorkstationDO.class);
+ updateObj.setId(existWorkstation.getId());
+ updateObj.setWorkshopId(workshop.getId());
+ updateObj.setProcessId(process.getId());
+ workstationMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "宸ヤ綔绔欑紪鐮佸凡瀛樺湪");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3