From db943c2bb6994c0fe5258af5f82dfb5b61104a0c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:45:15 +0800
Subject: [PATCH] 1.每个机构只能创建一个仓库 2.去除默认机构默认仓库
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 7 +------
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 4 ++--
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 12 +++++++++---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 2 +-
6 files changed, 15 insertions(+), 14 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 50da269..6d20037 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
@@ -269,7 +269,7 @@
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犱粨搴擄紒");
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..32c40ee 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
@@ -61,7 +61,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 +176,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("鏌ヨ澶辫触锛�");
}
@@ -214,7 +220,7 @@
warehouseQry = param2;
Long agencyId = warehouseQry.getAgencyId();
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1);
List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index e03af4f..84b7500 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -131,7 +131,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), null, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
@@ -298,7 +298,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), null, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
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 6855ab0..334f344 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
@@ -47,7 +47,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states);
+ List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short states);
/**
* 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
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 62f6b34..eee2192 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
@@ -162,7 +162,7 @@
* @Date 2023/10/27
*/
@Override
- public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) {
+ public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -170,11 +170,6 @@
if (agencyId != null) {
sql.append(" and AGENCY_ID =:AGENCY_ID ");
paramts.put("AGENCY_ID", agencyId);
- }
- // 鏄惁涓洪粯璁や粨搴�
- if (isDefault != null) {
- sql.append(" and IS_DEFAULT =:isDefault ");
- paramts.put("isDefault", isDefault);
}
// 鐘舵��
if (states != null) {
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 4dde81b..459499b 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
@@ -217,7 +217,7 @@
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
// 璋冩嫧鐢宠鏃舵病鏈変粨搴搃d 鏌ヨ涓婄骇鏈烘瀯鐨勬墍鏈変粨搴�
List<BaseWarehouse> baseWareHouseList =
- baseWarehouseService.getBaseWareHouseList(outAgencyId, null, (short)1);
+ baseWarehouseService.getBaseWareHouseList(outAgencyId, (short)1);
List<Long> warehouseIdList =
baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
--
Gitblit v1.9.1