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/TCrmWarehouseController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
index caafd52..517a58d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
@@ -7,16 +7,22 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TCrmWarehouseDTO;
+import com.ruoyi.system.model.TCrmSupplier;
+import com.ruoyi.system.model.TCrmSupplierToWarehouse;
import com.ruoyi.system.model.TCrmWarehouse;
import com.ruoyi.system.query.TCrmWarehouseQuery;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TCrmSupplierService;
+import com.ruoyi.system.service.TCrmSupplierToWarehouseService;
import com.ruoyi.system.service.TCrmWarehouseService;
import com.ruoyi.system.vo.TCrmWarehouseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -38,10 +44,16 @@
private final TCrmWarehouseService crmWarehouseService;
private final ISysUserService sysUserService;
+ private final TokenService tokenService;
+ private final TCrmSupplierToWarehouseService crmSupplierToWarehouseService;
+ private final TCrmSupplierService crmSupplierService;
@Autowired
- public TCrmWarehouseController(TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService) {
+ public TCrmWarehouseController(TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService, TokenService tokenService, TCrmSupplierToWarehouseService crmSupplierToWarehouseService, TCrmSupplierService crmSupplierService) {
this.crmWarehouseService = crmWarehouseService;
this.sysUserService = sysUserService;
+ this.tokenService = tokenService;
+ this.crmSupplierToWarehouseService = crmSupplierToWarehouseService;
+ this.crmSupplierService = crmSupplierService;
}
/**
@@ -65,6 +77,40 @@
}
/**
+ * 获取crm仓库管理管理列表
+ */
+ @ApiOperation(value = "获取crm供应商下的仓库管理列表")
+ @PostMapping(value = "/listBySupplierId")
+ public R<TCrmWarehouse> listBySupplierId() {
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ Long userId = tokenService.getLoginUser().getUserId();
+ if(roleType == 4){
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, userId)
+ .last("LIMIT 1"));
+ TCrmWarehouse crmWarehouse = crmWarehouseService.getById(crmSupplier.getWarehouseId());
+ return R.ok(crmWarehouse);
+ }
+// if(roleType == 4){
+// TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+// .eq(TCrmSupplier::getUserId, userId)
+// .last("LIMIT 1"));
+// List<TCrmSupplierToWarehouse> list = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
+// .eq(TCrmSupplierToWarehouse::getSupplierId, crmSupplier.getId()));
+// if(CollectionUtils.isEmpty(list)){
+// return R.ok();
+// }
+// List<String> warehouseIds = list.stream().map(TCrmSupplierToWarehouse::getWarehouseId).collect(Collectors.toList());
+// List<TCrmWarehouse> crmWarehouseList = crmWarehouseService.list(Wrappers.lambdaQuery(TCrmWarehouse.class)
+// .eq(TCrmWarehouse::getStatus, 1)
+// .in(TCrmWarehouse::getId, warehouseIds)
+// .orderByDesc(TCrmWarehouse::getCreateTime));
+// return R.ok(crmWarehouseList);
+// }
+ return R.ok();
+ }
+
+ /**
* 添加crm仓库管理管理
*/
@Log(title = "crm仓库管理信息-新增crm仓库管理", businessType = BusinessType.INSERT)
--
Gitblit v1.7.1