From 350125984c618f95d09fb08978953ad24f5d3b6c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 13:53:48 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java | 8 --------
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 17 -----------------
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 4 ++--
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 2 +-
4 files changed, 3 insertions(+), 28 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 0b53c60..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
@@ -197,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();
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
index ea050e1..038ab3e 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -49,13 +49,5 @@
*/
List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states);
- /**
- * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
- *
- * @param agencyId
- * @return
- */
- BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId);
-
BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
index cd32db8..dc2fe69 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -179,23 +179,6 @@
return select(sql.toString(), paramts, new BaseWarehouse());
}
- /**
- * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
- *
- * @param agencyId
- * @return
- */
- @Override
- public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) {
- StringBuilder sql =
- new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId ");
- Map<String, Object> param = new HashMap<>();
- param.put("agencyId", agencyId);
- List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
- BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
- return baseWarehouse;
- }
-
@Override
public BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE STATES= 1");
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 2d800cf..b0e3d5e 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -119,7 +119,7 @@
// 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱涓殑绗竴涓�
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
- BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
+ BaseWarehouse warehouse = baseWarehouseService.getWarehouseByAgencyId(Long.valueOf(tenantId), null);
if (warehouse == null) {
log.error("浠撳簱涓嶅瓨鍦�");
throw new Exception("浠撳簱涓嶅瓨鍦�");
--
Gitblit v1.9.1