wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
alex
2023-08-15 15:19:32 +08:00
parent 26dd70efb3 f6d192079f
commit 7152bbddb3
6 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -47,7 +47,6 @@ namespace Tnb.WarehouseMgr
private readonly IWareHouseService _wareHouseService; private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
public WmsPDAInStockService( public WmsPDAInStockService(
ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
@@ -56,7 +55,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
ChannelWriter<NotifyMessage> channelWriter) ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_runService = runService; _runService = runService;
@@ -64,7 +64,6 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService; _wareHouseService = wareHouseService;
_userManager = userManager; _userManager = userManager;
_billRullService = billRullService; _billRullService = billRullService;
_channelWriter = channelWriter;
OverideFuncs.CreateAsync = ScanCodeInStock; OverideFuncs.CreateAsync = ScanCodeInStock;
} }
@@ -280,9 +279,7 @@ namespace Tnb.WarehouseMgr
} }
finally finally
{ {
//向队列写入消息 await Publish(nameof(IWareHouseService.GenTaskExecute));
NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) };
await _channelWriter.WriteAsync(message);
} }
return Task.FromResult(true); return Task.FromResult(true);
} }

3
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
View File

@@ -50,7 +50,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
ITaskMessageNotify taskMessageNotify):base(taskMessageNotify.Writer) ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_runService = runService; _runService = runService;

9
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAOutBaleServiceService.cs
View File

@@ -41,7 +41,6 @@ namespace Tnb.WarehouseMgr
private readonly IWareHouseService _wareHouseService; private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
public WmsPDAOutBaleService( public WmsPDAOutBaleService(
ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
IRunService runService, IRunService runService,
@@ -49,7 +48,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
ChannelWriter<NotifyMessage> channelWriter) ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_runService = runService; _runService = runService;
@@ -57,7 +57,6 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService; _wareHouseService = wareHouseService;
_userManager = userManager; _userManager = userManager;
_billRullService = billRullService; _billRullService = billRullService;
_channelWriter = channelWriter;
OverideFuncs.CreateAsync = PDAOutBale; OverideFuncs.CreateAsync = PDAOutBale;
} }
@@ -161,9 +160,7 @@ namespace Tnb.WarehouseMgr
} }
finally finally
{ {
//向队列写入消息 await Publish(nameof(IWareHouseService.GenTaskExecute));
NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) };
await _channelWriter.WriteAsync(message);
} }
return Task.FromResult(true); return Task.FromResult(true);
} }

10
WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs
View File

@@ -43,7 +43,7 @@ namespace Tnb.WarehouseMgr
private readonly IWareHouseService _wareHouseService; private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
public WmsPDATransferService( public WmsPDATransferService(
ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
IRunService runService, IRunService runService,
@@ -51,7 +51,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
ChannelWriter<NotifyMessage> channelWriter) ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_runService = runService; _runService = runService;
@@ -59,7 +60,6 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService; _wareHouseService = wareHouseService;
_userManager = userManager; _userManager = userManager;
_billRullService = billRullService; _billRullService = billRullService;
_channelWriter = channelWriter;
OverideFuncs.CreateAsync = CarryTransfer; OverideFuncs.CreateAsync = CarryTransfer;
} }
@@ -155,9 +155,7 @@ namespace Tnb.WarehouseMgr
} }
finally finally
{ {
//向队列写入消息 await Publish(nameof(IWareHouseService.GenTaskExecute));
NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) };
await _channelWriter.WriteAsync(message);
} }
return Task.FromResult(true); return Task.FromResult(true);
} }

11
WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs
View File

@@ -37,7 +37,7 @@ namespace Tnb.WarehouseMgr
private readonly IWareHouseService _warehouseService; private readonly IWareHouseService _warehouseService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly IWmsKittingInStkService _wmsKittingInStkService; private readonly IWmsKittingInStkService _wmsKittingInStkService;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
public WmsRobotCallbackService( public WmsRobotCallbackService(
IWmsCarryBindService wmsCarryBindService, IWmsCarryBindService wmsCarryBindService,
ISqlSugarRepository<WmsCarrybindH> repository, ISqlSugarRepository<WmsCarrybindH> repository,
@@ -45,7 +45,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService warehouseService, IWareHouseService warehouseService,
IBillRullService billRullService, IBillRullService billRullService,
IWmsKittingInStkService wmsKittingInStkService, IWmsKittingInStkService wmsKittingInStkService,
ChannelWriter<NotifyMessage> channelWriter) ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
{ {
_wmsCarryBindService = wmsCarryBindService; _wmsCarryBindService = wmsCarryBindService;
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
@@ -53,7 +54,6 @@ namespace Tnb.WarehouseMgr
_warehouseService = warehouseService; _warehouseService = warehouseService;
_billRullService = billRullService; _billRullService = billRullService;
_wmsKittingInStkService = wmsKittingInStkService; _wmsKittingInStkService = wmsKittingInStkService;
_channelWriter = channelWriter;
} }
/// <summary> /// <summary>
/// 机器人完成任务后回调接口 /// 机器人完成任务后回调接口
@@ -84,7 +84,7 @@ namespace Tnb.WarehouseMgr
carry.carry_status = ((int)EnumCarryStatus.齐套).ToString(); 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(); await _db.Updateable(carry).UpdateColumns(it => new { it.collocation_scheme_id, it.collocation_scheme_code, it.carry_status }).ExecuteCommandAsync();
if (input.isLast) if (input.isLast)
{ {
var kittingout = await _db.Queryable<WmsKittingoutH>().FirstAsync(it => it.collocation_scheme_id == carry.collocation_scheme_id && it.status == WmsWareHouseConst.BILLSTATUS_CALLED_ID); var kittingout = await _db.Queryable<WmsKittingoutH>().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.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new List<string> { carry.location_id! }; genPreTaskAfterUpInput.LocationIds = new List<string> { carry.location_id! };
await _warehouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 }); await _warehouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) }; await Publish(nameof(IWareHouseService.GenTaskExecute));
await _channelWriter.WriteAsync(message);
} }
} }
else else

10
WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
View File

@@ -43,7 +43,7 @@ namespace Tnb.WarehouseMgr
private readonly IWareHouseService _wareHouseService; private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
public WmsTransferService( public WmsTransferService(
ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
IRunService runService, IRunService runService,
@@ -51,7 +51,7 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
IUserManager userManager, IUserManager userManager,
IBillRullService billRullService, IBillRullService billRullService,
ChannelWriter<NotifyMessage> channelWriter) ITaskMessageNotify taskMessageNotify):base(taskMessageNotify.Writer)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_runService = runService; _runService = runService;
@@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService; _wareHouseService = wareHouseService;
_userManager = userManager; _userManager = userManager;
_billRullService = billRullService; _billRullService = billRullService;
_channelWriter = channelWriter;
OverideFuncs.CreateAsync = CarryTransfer; OverideFuncs.CreateAsync = CarryTransfer;
} }
@@ -157,9 +157,7 @@ namespace Tnb.WarehouseMgr
} }
finally finally
{ {
//向队列写入消息 await Publish(nameof(IWareHouseService.GenTaskExecute));
NotifyMessage message = new() { TaskName = nameof(IWareHouseService.GenTaskExecute) };
await _channelWriter.WriteAsync(message);
} }
return Task.FromResult(true); return Task.FromResult(true);
} }