From 4d15fa8051884869c5b612d0641508874cc71811 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 29 七月 2026 11:04:15 +0800
Subject: [PATCH] feat(erp): 集成SRM供应商服务并优化ERP模块功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 64db7cd..8648677 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,5 +1,6 @@
package cn.iocoder.yudao.module.erp.service.purchase;
+import cn.hutool.core.collection.CollUtil;
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;
@@ -7,12 +8,16 @@
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.Collection;
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.module.erp.enums.ErrorCodeConstants.*;
@@ -28,6 +33,9 @@
@Resource
private ErpSupplierMapper supplierMapper;
+
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
@Override
public Long createSupplier(ErpSupplierSaveReqVO createReqVO) {
@@ -49,8 +57,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) {
@@ -66,18 +91,21 @@
@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
public List<ErpSupplierDO> getSupplierList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return CollUtil.newArrayList();
+ }
return supplierMapper.selectByIds(ids);
}
--
Gitblit v1.9.3