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/packages/MesWmPackageServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
index 001b411..bf5a92f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
@@ -2,9 +2,12 @@
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.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO;
@@ -17,8 +20,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
+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.framework.common.util.collection.CollectionUtils.convertList;
@@ -27,7 +33,7 @@
/**
* MES 瑁呯鍗� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -44,6 +50,7 @@
private CrmCustomerApi customerApi;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createPackage(MesWmPackageSaveReqVO createReqVO) {
// 鏍￠獙缂栫爜鍞竴鎬�
validateCodeUnique(null, createReqVO.getCode());
@@ -61,6 +68,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updatePackage(MesWmPackageSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(updateReqVO.getId());
@@ -101,9 +109,15 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void finishPackage(Long id) {
// 鏍￠獙瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(id);
+
+ // 瑁呯鍗曞繀椤诲瓨鍦ㄨ绠辨槑缁�
+ if (packageLineService.getPackageLineCountByPackageId(id) == 0) {
+ throw exception(WM_PACKAGE_LINE_NOT_EXISTS);
+ }
// 鏇存柊鐘舵�佷负宸插畬鎴�
packageMapper.updateById(new MesWmPackageDO()
@@ -116,6 +130,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addChildPackage(Long parentId, Long childId) {
// 鏍￠獙鐖剁瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(parentId);
@@ -129,6 +144,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void removeChildPackage(Long childId) {
// 鏍￠獙瀛愮瀛樺湪
MesWmPackageDO child = validatePackageExists(childId);
@@ -224,4 +240,46 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmPackageImportRespVO importPackageList(List<MesWmPackageImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_PACKAGE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmPackageImportRespVO respVO = MesWmPackageImportRespVO.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;
+ }
+ MesWmPackageDO existing = packageMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmPackageStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmPackageDO updateObj = BeanUtils.toBean(importItem, MesWmPackageDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ packageMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmPackageDO createObj = BeanUtils.toBean(importItem, MesWmPackageDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmPackageStatusEnum.PREPARE.getStatus());
+ packageMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3