From f697280f473e9387ee387f25a678f113d734c9fe Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 九月 2025 18:31:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java
index f8027a8..51d88f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSupplierController.java
@@ -8,10 +8,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.TCrmSupplierDTO;
-import com.ruoyi.system.model.TCrmBranch;
-import com.ruoyi.system.model.TCrmChangePoints;
-import com.ruoyi.system.model.TCrmSalesperson;
-import com.ruoyi.system.model.TCrmSupplier;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TCrmSupplierQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TCrmSupplierVO;
@@ -41,10 +38,12 @@
private final TCrmSupplierService crmSupplierService;
private final ISysUserService sysUserService;
+ private final TCrmWarehouseService crmWarehouseService;
@Autowired
- public TCrmSupplierController(TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
+ public TCrmSupplierController(TCrmSupplierService crmSupplierService, ISysUserService sysUserService, TCrmWarehouseService crmWarehouseService) {
this.crmSupplierService = crmSupplierService;
this.sysUserService = sysUserService;
+ this.crmWarehouseService = crmWarehouseService;
}
/**
@@ -96,6 +95,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getById(id);
TCrmSupplierVO crmSupplierVO = new TCrmSupplierVO();
BeanUtils.copyProperties(crmSupplier, crmSupplierVO);
+ // 查询仓库
+ TCrmWarehouse crmWarehouse = crmWarehouseService.getById(crmSupplier.getWarehouseId());
+ if(Objects.nonNull(crmWarehouse)){
+ crmSupplierVO.setWarehouseName(crmWarehouse.getWarehouseName());
+ }
return R.ok(crmSupplierVO);
}
--
Gitblit v1.7.1