From 3884e330379c96e7576ada6b7a988a84e8757886 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 16:12:50 +0800
Subject: [PATCH] 修改查询库存的仓库参数
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 96 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index e0bf1e5..33651bc 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,5 +1,17 @@
package com.consum.base.controller;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
@@ -11,23 +23,18 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
/**
* @Description 浠撳簱绠＄悊
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+@Api(value = "浠撳簱绠＄悊", tags = "浠撳簱绠＄悊")
@RestController
@RequestMapping("/pc/base/warehouse")
public class BaseWarehouseController extends BaseController {
@@ -36,7 +43,6 @@
private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
-
/**
* @Description 鏂板
@@ -53,9 +59,9 @@
if (StringUtils.isEmpty(param.getWarehouseName())) {
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- //TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
+ // TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
- int result = this.baseWarehouseService.add(param);
+ int result = baseWarehouseService.add(param);
if (result > 0) {
return ResponseValue.success(1);
}
@@ -74,12 +80,12 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo == null) {
+ FinSysTenantUser currentUser = this.getSysInfo();
+ if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- param.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
+ param.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ GenericPager<BaseWarehouse> pager = baseWarehouseService.queryList(param, currentUser);
return ResponseValue.success(pager);
}
@@ -103,7 +109,7 @@
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- int num = this.baseWarehouseService.updateBaseWarehouse(baseWarehouse);
+ int num = baseWarehouseService.updateBaseWarehouse(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
@@ -118,7 +124,7 @@
if (id == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
- BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
+ BaseWarehouse baseWarehouse = baseWarehouseService.getById(id);
if (baseWarehouse == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -140,23 +146,9 @@
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
- int num = this.baseWarehouseService.updateById(baseWarehouse);
+ int num = baseWarehouseService.updateById(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
- }
-
- /**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- @GetMapping("/select/userList")
- public ResponseValue queryList(Long baseWarehouseId) {
- if (baseWarehouseId == null) {
- return ResponseValue.error("浠撳簱id涓虹┖");
- }
- this.baseWarehouseService.queryUserList(baseWarehouseId);
- return ResponseValue.success();
}
/**
@@ -169,7 +161,7 @@
if (agencyId == null) {
return ResponseValue.success(new ArrayList<>());
}
- List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null);
+ List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -177,9 +169,8 @@
}
@ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true, dataType = "WarehouseQry", paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
+ dataType = "WarehouseQry", paramType = "query")})
@GetMapping("/select/number")
public ResponseValue selectNumber() {
WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
@@ -190,18 +181,43 @@
Long warehouseId = warehouseQry.getWarehouseId();
if (warehouseId == null) {
Long agencyId = warehouseQry.getAgencyId();
- BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
+ BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
warehouseId = defaultWarehouseByAgencyId.getId();
}
+ Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
+ Integer warehouseType = warehouseQry.getWarehouseType();
+ Integer buyType = warehouseQry.getBuyType();
+
+ // 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚︿篃瑕佹煡閮ㄩ棬绫诲瀷鐨勫簱瀛�
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, buyType);
+ return ResponseValue.success(num);
+ }
+
+ @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
+ @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
+ dataType = "WarehouseQry", paramType = "query")})
+ @GetMapping("/select/in/warehouse/num")
+ public ResponseValue selectAllNumber() {
+ WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
+ WarehouseQry param2 = new WarehouseQry();
+ CommonUtil.copyProperties(warehouseQry, param2);
+ warehouseQry = param2;
+
+ Long agencyId = warehouseQry.getAgencyId();
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
+
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
Integer warehouseType = warehouseQry.getWarehouseType();
Integer states = warehouseQry.getStates();
Integer buyType = warehouseQry.getBuyType();
- int num = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, buyType);
+ // 璋冩嫧鏃跺彧鏌ユ満鏋勭被鍨嬬殑闆嗛噰浠撳簱搴撳瓨
+ // 閮ㄩ棬鍒嗗彂鏃朵笉鍒嗘満鏋勫拰閮ㄩ棬锛屽洜涓鸿皟鎷ㄨ繘鏉ョ殑鐗╁搧涔熺畻鍦ㄥ簱瀛橀噷鍙槸绫诲瀷涓洪儴闂紝鍚屾牱妫�瑙嗘墍鏈変粨搴撹鍨嬪彿鐨勬暟閲�
+ int num = lWhGoodsService.queryGoodsModelInWareHouseNum(warehouseType, warehouseIdList, baseGoodsModelsId,
+ states, buyType);
return ResponseValue.success(num);
}
-
}
-
--
Gitblit v1.9.1