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/impl/LWhFormTransferServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
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 87450ce..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
@@ -20,6 +20,7 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.type.CategoryType;
import com.consum.base.core.type.TransferBusinessType;
+import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -114,7 +115,7 @@
// 璋冩嫧绫诲瀷鍗曟嵁
if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
- // 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
+ // 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱涓殑绗竴涓�
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
@@ -147,13 +148,13 @@
baseWarehouse.setId(baseWarehouseId);
BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
- lWhFormTransfer.setInWarehouseType(1);
+ lWhFormTransfer.setInWarehouseType(WareHouseType.DEPARTMENT.getValue());
lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
lWhFormTransfer.setInOperatorName(param.getOperatorName());
lWhFormTransfer.setInTime(param.getCreateTime());
- lWhFormTransfer.setOutWarehouseType(0);
+ lWhFormTransfer.setOutWarehouseType(WareHouseType.TENANT.getValue());
lWhFormTransfer.setOutWarehouseId(warehouse.getId());
lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
@@ -216,10 +217,11 @@
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
// 璋冩嫧鐢宠鏃舵病鏈変粨搴搃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(0, warehouseIdList, baseGoodsModelsId, 1, null);
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
+ baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
--
Gitblit v1.9.1