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/service/BaseWarehouseService.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 5 +++--
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 3 ++-
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 4 +++-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 3 ++-
6 files changed, 12 insertions(+), 7 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 6d20037..0a43a4e 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,8 @@
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1);
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
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 32c40ee..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;
@@ -220,7 +221,8 @@
warehouseQry = param2;
Long agencyId = warehouseQry.getAgencyId();
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (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();
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 84b7500..bc750e4 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
@@ -24,6 +24,7 @@
import com.consum.base.BaseController;
import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.GoodsUseRecordVO;
@@ -131,7 +132,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
@@ -298,7 +299,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
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 334f344..ea050e1 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 states);
+ List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer 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 eee2192..cd32db8 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 states) {
+ public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
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 459499b..2d800cf 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
@@ -19,6 +19,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.type.CategoryType;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.type.TransferBusinessType;
import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
@@ -217,7 +218,7 @@
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
// 璋冩嫧鐢宠鏃舵病鏈変粨搴搃d 鏌ヨ涓婄骇鏈烘瀯鐨勬墍鏈変粨搴�
List<BaseWarehouse> baseWareHouseList =
- baseWarehouseService.getBaseWareHouseList(outAgencyId, (short)1);
+ baseWarehouseService.getBaseWareHouseList(outAgencyId, StatesType.NORMAL.getValue());
List<Long> warehouseIdList =
baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
--
Gitblit v1.9.1