From e2d97f3c90a6baa36b9edefe927225da907a27c6 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 10:02:15 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 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 3cad491..0b53c60 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;
@@ -20,7 +21,9 @@
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhGoods;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
@@ -59,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) {
@@ -146,6 +155,13 @@
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
+ Long id = baseWarehouse.getId();
+ LWhGoods lWhGoods = new LWhGoods();
+ lWhGoods.setWarehouseId(id);
+ List<LWhGoods> select = lWhGoodsService.select(lWhGoods);
+ if (!CollectionUtils.isEmpty(select)) {
+ return ResponseValue.error("璇ヤ粨搴撴鍦ㄤ娇鐢紝涓嶈兘鍒犻櫎");
+ }
int num = baseWarehouseService.updateById(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
@@ -161,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("鏌ヨ澶辫触锛�");
}
@@ -186,10 +202,9 @@
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
Integer warehouseType = warehouseQry.getWarehouseType();
- Integer states = warehouseQry.getStates();
Integer buyType = warehouseQry.getBuyType();
- // TODO 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚﹁鏌ラ儴闂ㄧ被鍨嬬殑搴撳瓨
+ // 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚︿篃瑕佹煡閮ㄩ棬绫诲瀷鐨勫簱瀛�
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, buyType);
return ResponseValue.success(num);
@@ -206,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