diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index 09201eb3..8cb07c4c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -47,7 +47,6 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; - private readonly ChannelWriter _channelWriter; public WmsPDAInStockService( ISqlSugarRepository repository, @@ -56,7 +55,8 @@ namespace Tnb.WarehouseMgr IWareHouseService wareHouseService, IUserManager userManager, IBillRullService billRullService, - ChannelWriter channelWriter) + ITaskMessageNotify taskMessageNotify + ) : base(taskMessageNotify.Writer) { _db = repository.AsSugarClient(); _runService = runService; @@ -64,7 +64,6 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - _channelWriter = channelWriter; OverideFuncs.CreateAsync = ScanCodeInStock; } @@ -280,9 +279,7 @@ namespace Tnb.WarehouseMgr } finally { - //向队列写入消息 - NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; - await _channelWriter.WriteAsync(message); + await Publish(nameof(IWareHouseService.GenTaskExecute)); } return Task.FromResult(true); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs index c283d43b..5f2de722 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs @@ -50,7 +50,8 @@ namespace Tnb.WarehouseMgr IWareHouseService wareHouseService, IUserManager userManager, IBillRullService billRullService, - ITaskMessageNotify taskMessageNotify):base(taskMessageNotify.Writer) + ITaskMessageNotify taskMessageNotify + ) : base(taskMessageNotify.Writer) { _db = repository.AsSugarClient(); _runService = runService; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs index 9da5a7b8..bfeb7d81 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs @@ -41,7 +41,6 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; - private readonly ChannelWriter _channelWriter; public WmsPDAOutBaleService( ISqlSugarRepository repository, IRunService runService, @@ -49,7 +48,8 @@ namespace Tnb.WarehouseMgr IWareHouseService wareHouseService, IUserManager userManager, IBillRullService billRullService, - ChannelWriter channelWriter) + ITaskMessageNotify taskMessageNotify + ) : base(taskMessageNotify.Writer) { _db = repository.AsSugarClient(); _runService = runService; @@ -57,7 +57,6 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - _channelWriter = channelWriter; OverideFuncs.CreateAsync = PDAOutBale; } @@ -161,9 +160,7 @@ namespace Tnb.WarehouseMgr } finally { - //向队列写入消息 - NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; - await _channelWriter.WriteAsync(message); + await Publish(nameof(IWareHouseService.GenTaskExecute)); } return Task.FromResult(true); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs index 7fac48cd..1411a4c5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs @@ -43,7 +43,7 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; - private readonly ChannelWriter _channelWriter; + public WmsPDATransferService( ISqlSugarRepository repository, IRunService runService, @@ -51,7 +51,8 @@ namespace Tnb.WarehouseMgr IWareHouseService wareHouseService, IUserManager userManager, IBillRullService billRullService, - ChannelWriter channelWriter) + ITaskMessageNotify taskMessageNotify + ) : base(taskMessageNotify.Writer) { _db = repository.AsSugarClient(); _runService = runService; @@ -59,7 +60,6 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - _channelWriter = channelWriter; OverideFuncs.CreateAsync = CarryTransfer; } @@ -155,9 +155,7 @@ namespace Tnb.WarehouseMgr } finally { - //向队列写入消息 - NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; - await _channelWriter.WriteAsync(message); + await Publish(nameof(IWareHouseService.GenTaskExecute)); } return Task.FromResult(true); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs index 34c02a13..67f09f44 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs @@ -37,7 +37,7 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _warehouseService; private readonly IBillRullService _billRullService; private readonly IWmsKittingInStkService _wmsKittingInStkService; - private readonly ChannelWriter _channelWriter; + public WmsRobotCallbackService( IWmsCarryBindService wmsCarryBindService, ISqlSugarRepository repository, @@ -45,7 +45,8 @@ namespace Tnb.WarehouseMgr IWareHouseService warehouseService, IBillRullService billRullService, IWmsKittingInStkService wmsKittingInStkService, - ChannelWriter channelWriter) + ITaskMessageNotify taskMessageNotify + ) : base(taskMessageNotify.Writer) { _wmsCarryBindService = wmsCarryBindService; _db = repository.AsSugarClient(); @@ -53,7 +54,6 @@ namespace Tnb.WarehouseMgr _warehouseService = warehouseService; _billRullService = billRullService; _wmsKittingInStkService = wmsKittingInStkService; - _channelWriter = channelWriter; } /// /// 机器人完成任务后回调接口 @@ -84,7 +84,7 @@ namespace Tnb.WarehouseMgr carry.carry_status = ((int)EnumCarryStatus.齐套).ToString(); await _db.Updateable(carry).UpdateColumns(it => new { it.collocation_scheme_id, it.collocation_scheme_code, it.carry_status }).ExecuteCommandAsync(); - + if (input.isLast) { var kittingout = await _db.Queryable().FirstAsync(it => it.collocation_scheme_id == carry.collocation_scheme_id && it.status == WmsWareHouseConst.BILLSTATUS_CALLED_ID); @@ -145,8 +145,7 @@ namespace Tnb.WarehouseMgr genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); genPreTaskAfterUpInput.LocationIds = new List { carry.location_id! }; await _warehouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 }); - NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; - await _channelWriter.WriteAsync(message); + await Publish(nameof(IWareHouseService.GenTaskExecute)); } } else diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs index 3223715d..54990cfe 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs @@ -43,7 +43,7 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; - private readonly ChannelWriter _channelWriter; + public WmsTransferService( ISqlSugarRepository repository, IRunService runService, @@ -51,7 +51,7 @@ namespace Tnb.WarehouseMgr IWareHouseService wareHouseService, IUserManager userManager, IBillRullService billRullService, - ChannelWriter channelWriter) + ITaskMessageNotify taskMessageNotify):base(taskMessageNotify.Writer) { _db = repository.AsSugarClient(); _runService = runService; @@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - _channelWriter = channelWriter; + OverideFuncs.CreateAsync = CarryTransfer; } @@ -157,9 +157,7 @@ namespace Tnb.WarehouseMgr } finally { - //向队列写入消息 - NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; - await _channelWriter.WriteAsync(message); + await Publish(nameof(IWareHouseService.GenTaskExecute)); } return Task.FromResult(true); }