From 8fc8b4788ed8be27ff6aae1cdd3fe9a584972ae3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 18:41:05 +0800
Subject: [PATCH] feat: 物品统计；库存预警模板下载、上传、下载异常文件
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 241bff7..39c11d8 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -8,12 +8,8 @@
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.base.service.LWhGoodsService;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.SDictData;
+import com.consum.model.po.*;
import com.consum.model.vo.BaseGoodsTemplateVo;
-import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
@@ -54,6 +50,10 @@
*/
@PostMapping("/add")
public ResponseValue add(@RequestBody BaseGoodsTemplateParam param) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (param.getCategoryId() == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
if (param.getCategoryId() == null) {
return ResponseValue.error("鍒嗙被涓虹┖");
}
@@ -66,7 +66,7 @@
return ResponseValue.error("鐗╁搧鍚嶇О宸插瓨鍦�");
}
- int result = this.baseGoodsTemplateService.add(param, this.getCurrentUser());
+ int result = this.baseGoodsTemplateService.add(param, sysInfo);
if (result > 0) {
return ResponseValue.success(1);
}
@@ -80,10 +80,11 @@
*/
@GetMapping("/list")
public ResponseValue queryList(BaseGoodsTemplateParam param) {
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+ param.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager<BaseGoodsTemplate> pager = this.baseGoodsTemplateService.queryList(param);
return ResponseValue.success(pager);
}
@@ -182,7 +183,7 @@
@GetMapping("/query/goodsTemplate")
public ResponseValue queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
- List<BaseGoodsTemplate> list = this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, categoryId);
+ List<BaseGoodsTemplate> list = this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, categoryId,null,null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -201,8 +202,8 @@
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId,(short)1,(short)1);
- if (CollectionUtils.isEmpty(baseWarehouseList)){
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId, (short) 1, (short) 1);
+ if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
--
Gitblit v1.9.1