From 6665ddbc6dd0fe82ea3d47cd2bb5e48a5a27a712 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:46:57 +0800
Subject: [PATCH] feat: 报废明细
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 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 b1dcd6a..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,27 +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.query.WarehouseQry;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
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 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 浠撳簱绠＄悊
@@ -33,10 +36,9 @@
public class BaseWarehouseController extends BaseController {
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
-
/**
* @Description 鏂板
@@ -44,11 +46,16 @@
* @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) {
@@ -63,13 +70,18 @@
* @Date 2023/10/26
*/
@GetMapping("/list")
- public ResponseValue queryList(BaseWarehouseParam param) {
- FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo == null) {
+ 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(sysInfo.getTenantId()));
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
+ param.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser);
return ResponseValue.success(pager);
}
@@ -79,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("缂栬緫鐨勪粨搴撲笉瀛樺湪");
@@ -116,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涓虹┖");
}
@@ -146,10 +168,9 @@
*/
@GetMapping("/select/tenant_warehouse")
public ResponseValue getByAgencyId(Long agencyId) {
- // TODO 鏆傛棤鏈烘瀯
-// if (agencyId == null) {
-// return ResponseValue.error("鏈烘瀯id涓虹┖");
-// }
+ if (agencyId == null) {
+ return ResponseValue.success(new ArrayList<>());
+ }
List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
@@ -158,15 +179,20 @@
}
@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(@Validated WarehouseQry warehouseQry) {
+ 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);
+ BaseWarehouse defaultWarehouseByAgencyId =
+ this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
warehouseId = defaultWarehouseByAgencyId.getId();
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
@@ -178,6 +204,4 @@
return ResponseValue.success(num);
}
-
}
-
--
Gitblit v1.9.1