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-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java
index 9e56f4a..8815ba5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java
@@ -1,27 +1,39 @@
package cn.iocoder.yudao.module.erp.service.purchase;
import cn.hutool.core.collection.CollUtil;
+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.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpSupplierMapper;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
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.erp.enums.ErrorCodeConstants.*;
/**
* ERP 渚涘簲鍟� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -29,6 +41,9 @@
@Resource
private ErpSupplierMapper supplierMapper;
+
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
@Override
public Long createSupplier(ErpSupplierSaveReqVO createReqVO) {
@@ -50,8 +65,25 @@
public void deleteSupplier(Long id) {
// 鏍￠獙瀛樺湪
validateSupplierExists(id);
+ // 鏍￠獙渚涘簲鍟嗘槸鍚﹁涓氬姟寮曠敤
+ validateSupplierNoReference(id);
// 鍒犻櫎
supplierMapper.deleteById(id);
+ }
+
+ /**
+ * 鏍￠獙渚涘簲鍟嗘湭琚笟鍔″紩鐢紙閲囪喘銆佽川妫�銆佺敓浜с�佸簱瀛樼瓑锛�
+ *
+ * @param id 渚涘簲鍟嗙紪鍙�
+ */
+ private void validateSupplierNoReference(Long id) {
+ List<Map<String, Object>> references = supplierMapper.selectSupplierReferenceCount(id);
+ if (CollUtil.isNotEmpty(references)) {
+ String refDesc = references.stream()
+ .map(r -> r.get("source") + "(" + r.get("cnt") + ")")
+ .collect(Collectors.joining("銆�"));
+ throw exception(SUPPLIER_EXISTS_REFERENCE, refDesc);
+ }
}
private void validateSupplierExists(Long id) {
@@ -67,14 +99,14 @@
@Override
public ErpSupplierDO validateSupplier(Long id) {
- ErpSupplierDO supplier = supplierMapper.selectById(id);
+ SrmSupplierRespDTO supplier = srmSupplierApi.getSupplier(id).getCheckedData();
if (supplier == null) {
throw exception(SUPPLIER_NOT_EXISTS);
}
if (CommonStatusEnum.isDisable(supplier.getStatus())) {
throw exception(SUPPLIER_NOT_ENABLE, supplier.getName());
}
- return supplier;
+ return null;
}
@Override
@@ -95,4 +127,45 @@
return supplierMapper.selectListByStatus(status);
}
+ @Override
+ public ErpSupplierImportRespVO importSupplierList(List<ErpSupplierImportExcelVO> importSuppliers,
+ ErpSupplierImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importSuppliers = filterList(importSuppliers, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importSuppliers)) {
+ throw exception(SUPPLIER_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ ErpSupplierImportRespVO respVO = ErpSupplierImportRespVO.builder()
+ .createSupplierNames(new ArrayList<>())
+ .updateSupplierNames(new ArrayList<>())
+ .failureSupplierNames(new LinkedHashMap<>())
+ .build();
+ importSuppliers.forEach(importSupplier -> {
+ try {
+ ErpSupplierDO existSupplier = supplierMapper.selectByName(importSupplier.getName());
+ if (existSupplier == null) {
+ // 鏂板
+ ErpSupplierDO supplier = BeanUtils.toBean(importSupplier, ErpSupplierDO.class);
+ supplierMapper.insert(supplier);
+ respVO.getCreateSupplierNames().add(importSupplier.getName());
+ return;
+ }
+ // 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureSupplierNames().put(importSupplier.getName(),
+ StrUtil.format(SUPPLIER_NAME_EXISTS.getMsg(), importSupplier.getName()));
+ return;
+ }
+ ErpSupplierDO updateSupplier = BeanUtils.toBean(importSupplier, ErpSupplierDO.class)
+ .setId(existSupplier.getId());
+ supplierMapper.updateById(updateSupplier);
+ respVO.getUpdateSupplierNames().add(importSupplier.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureSupplierNames().put(importSupplier.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3