From 8cbe2b4e7c708fb6fef901915b8081a19c49213b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 14:33:35 +0800
Subject: [PATCH] 仓库增加机构显示
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 1fff7d3..6ce1fb5 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.pojo.query.WarehouseQry;
@@ -61,7 +62,13 @@
if (StringUtils.isEmpty(param.getWarehouseName())) {
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- // TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
+ Long agencyId = param.getAgencyId();
+ BaseWarehouse baseWarehouse = new BaseWarehouse();
+ baseWarehouse.setAgencyId(agencyId);
+ List<BaseWarehouse> select = baseWarehouseService.select(baseWarehouse);
+ if (!CollectionUtils.isEmpty(select)) {
+ return ResponseValue.error("璇ユ満鏋勫凡鏈変粨搴撲笉鑳界户缁柊澧烇紒");
+ }
int result = baseWarehouseService.add(param);
if (result > 0) {
@@ -170,7 +177,7 @@
if (agencyId == null) {
return ResponseValue.success(new ArrayList<>());
}
- List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null, null);
+ List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -190,8 +197,8 @@
Long warehouseId = warehouseQry.getWarehouseId();
if (warehouseId == null) {
Long agencyId = warehouseQry.getAgencyId();
- BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
- warehouseId = defaultWarehouseByAgencyId.getId();
+ BaseWarehouse baseWarehouse = baseWarehouseService.getWarehouseByAgencyId(agencyId, null);
+ warehouseId = baseWarehouse.getId();
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
Integer warehouseType = warehouseQry.getWarehouseType();
@@ -214,7 +221,8 @@
warehouseQry = param2;
Long agencyId = warehouseQry.getAgencyId();
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
--
Gitblit v1.9.1