From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 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 e8835d4..b1dcd6a 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
@@ -2,15 +2,26 @@
import com.consum.base.BaseController;
import com.consum.base.pojo.BaseWarehouseParam;
+import com.consum.base.pojo.query.WarehouseQry;
import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 浠撳簱绠＄悊
@@ -23,6 +34,9 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
+
/**
* @Description 鏂板
@@ -50,10 +64,11 @@
*/
@GetMapping("/list")
public ResponseValue queryList(BaseWarehouseParam param) {
-// FinSysTenantUser sysInfo = this.getSysInfo();
-// if (sysInfo == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ param.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
return ResponseValue.success(pager);
}
@@ -135,13 +150,34 @@
// if (agencyId == null) {
// return ResponseValue.error("鏈烘瀯id涓虹┖");
// }
- List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId,null,null);
+ List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
return ResponseValue.success("鏌ヨ鎴愬姛!", list);
}
+ @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true, dataType = "WarehouseQry", paramType = "query")
+ })
+ @GetMapping("/select/number")
+ public ResponseValue selectNumber(@Validated WarehouseQry warehouseQry) {
+ Long warehouseId = warehouseQry.getWarehouseId();
+ if (warehouseId == null) {
+ Long agencyId = warehouseQry.getAgencyId();
+ BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
+ warehouseId = defaultWarehouseByAgencyId.getId();
+ }
+ 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);
+ return ResponseValue.success(num);
+ }
+
}
--
Gitblit v1.9.1