From e2db1aee94ab93365b846f3856a5e8928efca328 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 10:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 25 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 f97656e..228d85a 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,19 +1,30 @@
package com.consum.base.controller;
+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;
+
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.pojo.FinSysTenantDepartmentParam;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.pojo.query.WarehouseQry;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
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 java.util.List;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 浠撳簱绠＄悊
@@ -25,7 +36,9 @@
public class BaseWarehouseController extends BaseController {
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
/**
* @Description 鏂板
@@ -33,14 +46,21 @@
* @Date 2023/10/26
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody BaseWarehouseParam param) {
+ public ResponseValue add() {
+ BaseWarehouseParam param = CommonUtil.getObjFromReqBody(BaseWarehouseParam.class);
+ BaseWarehouseParam param2 = new BaseWarehouseParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
if (StringUtils.isEmpty(param.getWarehouseName())) {
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- //TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
+ // TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
int result = this.baseWarehouseService.add(param);
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -50,12 +70,18 @@
* @Date 2023/10/26
*/
@GetMapping("/list")
- public ResponseValue queryList(BaseWarehouseParam param) {
-// FinSysTenantUser sysInfo = this.getSysInfo();
-// if (sysInfo == null) {
-// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-// }
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
+ public ResponseValue queryList() {
+ BaseWarehouseParam param = CommonUtil.getObjFromReq(BaseWarehouseParam.class);
+ BaseWarehouseParam param2 = new BaseWarehouseParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
+ FinSysTenantUser currentUser = this.getSysInfo();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ param.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser);
return ResponseValue.success(pager);
}
@@ -65,7 +91,12 @@
* @Date 2023/10/26
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody BaseWarehouse baseWarehouse) {
+ public ResponseValue edit() {
+ BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+ BaseWarehouse param2 = new BaseWarehouse();
+ CommonUtil.copyProperties(baseWarehouse, param2);
+ baseWarehouse = param2;
+
Long id = baseWarehouse.getId();
if (id == null || id <= 0) {
return ResponseValue.error("缂栬緫鐨勪粨搴撲笉瀛樺湪");
@@ -80,6 +111,7 @@
/**
* 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -89,7 +121,9 @@
return ResponseValue.error("浠撳簱id涓虹┖");
}
BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
- if (baseWarehouse == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ if (baseWarehouse == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
return ResponseValue.success("鏌ヨ鎴愬姛!", baseWarehouse);
}
@@ -99,7 +133,12 @@
* @Date 2023/10/26
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseWarehouse baseWarehouse) {
+ public ResponseValue updateById() {
+ BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+ BaseWarehouse param2 = new BaseWarehouse();
+ CommonUtil.copyProperties(baseWarehouse, param2);
+ baseWarehouse = param2;
+
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
@@ -115,7 +154,7 @@
*/
@GetMapping("/select/userList")
public ResponseValue queryList(Long baseWarehouseId) {
- if (baseWarehouseId == null){
+ if (baseWarehouseId == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
this.baseWarehouseService.queryUserList(baseWarehouseId);
@@ -123,20 +162,46 @@
}
/**
- * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
@GetMapping("/select/tenant_warehouse")
public ResponseValue getByAgencyId(Long agencyId) {
if (agencyId == null) {
- return ResponseValue.error("鏈烘瀯id涓虹┖");
+ return ResponseValue.success(new ArrayList<>());
}
- List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId);
- if (list == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ 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() {
+ WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
+ WarehouseQry param2 = new WarehouseQry();
+ CommonUtil.copyProperties(warehouseQry, param2);
+ warehouseQry = param2;
+
+ 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