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-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
index f3c581d..2a93e55 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
@@ -2,8 +2,14 @@
import cn.hutool.core.collection.CollUtil;
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.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportReqVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
@@ -11,17 +17,19 @@
import cn.iocoder.yudao.module.mdm.dal.mysql.unit.MdmUnitMeasureMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.mdm.enums.ErrorCodeConstants.*;
/**
* MDM 璁￠噺鍗曚綅 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -32,6 +40,53 @@
@Resource
private MdmItemMapper itemMapper;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MdmUnitMeasureImportRespVO importUnitMeasureList(List<MdmUnitMeasureImportExcelVO> importUnits,
+ MdmUnitMeasureImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖锛堜互鍗曚綅缂栫爜浣滀负瀵煎叆涓婚敭锛�
+ importUnits = filterList(importUnits, item -> StrUtil.isNotBlank(item.getCode()));
+ if (CollUtil.isEmpty(importUnits)) {
+ throw exception(MDM_UNIT_MEASURE_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愭潯澶勭悊
+ MdmUnitMeasureImportRespVO respVO = MdmUnitMeasureImportRespVO.builder()
+ .createUnitCodes(new ArrayList<>())
+ .updateUnitCodes(new ArrayList<>())
+ .failureUnitCodes(new LinkedHashMap<>())
+ .build();
+ importUnits.forEach(importUnit -> {
+ try {
+ // 2.1 鍒ゆ柇鏄惁瀛樺湪锛堟寜缂栫爜鍞竴锛�
+ MdmUnitMeasureDO existUnit = unitMeasureMapper.selectByCode(importUnit.getCode());
+ if (existUnit == null) {
+ // 2.1.1 鏂板
+ MdmUnitMeasureDO unit = BeanUtils.toBean(importUnit, MdmUnitMeasureDO.class);
+ if (unit.getStatus() == null) {
+ unit.setStatus(CommonStatusEnum.ENABLE.getStatus());
+ }
+ unitMeasureMapper.insert(unit);
+ respVO.getCreateUnitCodes().add(importUnit.getCode());
+ return;
+ }
+ // 2.1.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureUnitCodes().put(importUnit.getCode(),
+ StrUtil.format(MDM_UNIT_MEASURE_CODE_EXISTS.getMsg(), importUnit.getCode()));
+ return;
+ }
+ MdmUnitMeasureDO updateUnit = BeanUtils.toBean(importUnit, MdmUnitMeasureDO.class)
+ .setId(existUnit.getId());
+ unitMeasureMapper.updateById(updateUnit);
+ respVO.getUpdateUnitCodes().add(importUnit.getCode());
+ } catch (ServiceException ex) {
+ respVO.getFailureUnitCodes().put(importUnit.getCode(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
@Override
public Long createUnitMeasure(MdmUnitMeasureSaveReqVO createReqVO) {
@@ -65,13 +120,16 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteUnitMeasure(Long id) {
// 鏍￠獙瀛樺湪
- validateUnitMeasureExists(id);
+ MdmUnitMeasureDO unitMeasure = validateUnitMeasureExists(id);
// 鏍￠獙鏄惁琚墿鏂欎娇鐢紙鐩存帴浣跨敤 Mapper 閬垮厤寰幆渚濊禆锛�
if (itemMapper.selectCountByUnitMeasureId(id) > 0) {
throw exception(MDM_UNIT_MEASURE_EXISTS_ITEM);
}
+ // 鍏堟竻鐞嗗悓缂栫爜鐨勫凡杞垹闄よ剰鏁版嵁锛岄伩鍏嶅綋鍓嶈褰曡蒋鍒犳椂瑙﹀彂鍞竴閿啿绐�
+ unitMeasureMapper.physicalDeleteByCode(unitMeasure.getCode());
// 鍒犻櫎
unitMeasureMapper.deleteById(id);
}
--
Gitblit v1.9.3