From 2ffe8ae42a3350588fa9235f22592e5ed6e51fe7 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 21 十一月 2023 14:27:27 +0800
Subject: [PATCH] feat: 赋值
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 26 +++++++++++++++-----------
1 files changed, 15 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 27c9099..d03b55d 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
@@ -11,9 +11,9 @@
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.SDictData;
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;
@@ -58,6 +58,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("鍒嗙被涓虹┖");
}
@@ -70,7 +74,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);
}
@@ -84,10 +88,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);
}
@@ -205,13 +210,12 @@
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId);
- baseWarehouseList.forEach(baseWarehouse -> {
- Integer isDefault = baseWarehouse.getIsDefault();
- if (isDefault == 1) {
- map.put("warehouseId", baseWarehouse.getId());
- }
- });
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId, (short) 1, (short) 1);
+ if (CollectionUtils.isEmpty(baseWarehouseList)) {
+ return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+
+ }
+ map.put("warehouseId", baseWarehouseList.get(0).getId());
String sql = "SELECT DISTINCT bgt.id,bgt.GOODS_NAME FROM l_wh_goods g LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.id "
+ "WHERE WAREHOUSE_TYPE = 0 "
--
Gitblit v1.9.1