From 1b8db0473522c886428767f7eeaaf7f52d47ce42 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 15:30:41 +0800
Subject: [PATCH] 1.盘带人级联 2.盘点物品为仓库内物品
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 459499b..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
@@ -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;
@@ -118,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("浠撳簱涓嶅瓨鍦�");
@@ -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