From 6675fd73b778cae3f9b5d4d6a046c51429a5aa66 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 15 Jun 2023 11:40:07 +0800 Subject: [PATCH] 1 --- .../Tnb.WarehouseMgr/BaseWareHouseService.cs | 15 ++++----------- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 4 ++-- .../WmsCarryMoveInStockService.cs | 2 ++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index d6288960..24a43668 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -31,23 +31,16 @@ namespace Tnb.WarehouseMgr var bizTypeId = serviceType.GetCustomAttribute()?.BizTypeId; if (!bizTypeId.IsNullOrEmpty()) { - _serviceMap[bizTypeId!] = (BaseWareHouseService)Activator.CreateInstance(serviceType)!; + _serviceMap[bizTypeId!] = (BaseWareHouseService)App.GetService(serviceType)!; } } } - protected Task this[WareHouseUpInput input] + protected async Task DoUpdate(WareHouseUpInput input) { - set + if (_serviceMap.ContainsKey(input.bizTypeId)) { - if (_serviceMap.ContainsKey(input.bizTypeId)) - { - _serviceMap[input.bizTypeId].ModifyAsync(input); - } - } - get - { - return Task.CompletedTask; + await _serviceMap[input.bizTypeId].ModifyAsync(input); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 15506c46..6510ff98 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -428,11 +428,11 @@ namespace Tnb.WarehouseMgr var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id }; if (dt.is_chain == 0) { - await base[upInput]; + await DoUpdate(upInput); } else if (dt.is_chain == 1 && dt.chain_type == "3") { - await base[upInput]; + await DoUpdate(upInput); } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs index 93598c5c..453c6ebd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs @@ -40,6 +40,8 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; + + public WmsCarryMoveInStockService( ISqlSugarRepository repository, IRunService runService,