From 1742240f8f6841e2d930e549caabab94f2a58ece Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 22 十一月 2023 18:37:10 +0800
Subject: [PATCH] --报废单
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 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 f278db3..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,16 +2,26 @@
import com.consum.base.BaseController;
import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.pojo.FinSysTenantDepartmentParam;
+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.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 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.web.bind.annotation.*;
+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 浠撳簱绠＄悊
@@ -24,6 +34,9 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
+
/**
* @Description 鏂板
@@ -38,7 +51,9 @@
//TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
int result = this.baseWarehouseService.add(param);
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -53,7 +68,8 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param,sysInfo);
+ param.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
return ResponseValue.success(pager);
}
@@ -77,7 +93,8 @@
}
/**
- * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+ * 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -87,7 +104,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);
}
@@ -113,12 +132,52 @@
*/
@GetMapping("/select/userList")
public ResponseValue queryList(Long baseWarehouseId) {
- if (baseWarehouseId == null){
+ if (baseWarehouseId == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
this.baseWarehouseService.queryUserList(baseWarehouseId);
return ResponseValue.success();
}
+ /**
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ @GetMapping("/select/tenant_warehouse")
+ public ResponseValue getByAgencyId(Long agencyId) {
+ // TODO 鏆傛棤鏈烘瀯
+// if (agencyId == null) {
+// return ResponseValue.error("鏈烘瀯id涓虹┖");
+// }
+ 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