1、删除无用类

2、调整定时逻辑,将定时改为框架的事件总线
3、电梯业务逻辑代码调整
This commit is contained in:
yang.lee
2023-10-31 17:37:54 +08:00
parent eddb6edf45
commit 74118cccf4
40 changed files with 542 additions and 548 deletions

View File

@@ -11,6 +11,7 @@ using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.EventBus;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Interfaces.System;
@@ -56,8 +57,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService,
IUserManager userManager,
IBillRullService billRullService,
ITaskMessageNotify taskMessageNotify
) : base(taskMessageNotify.Writer)
IEventPublisher eventPublisher
)
{
_db = repository.AsSugarClient();
_runService = runService;
@@ -66,6 +67,7 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService;
_userManager = userManager;
_billRullService = billRullService;
EventPublisher = eventPublisher;
OverideFuncs.CreateAsync = Create;
}
/// <summary>
@@ -128,7 +130,7 @@ namespace Tnb.WarehouseMgr
{
var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
Log.Information($"经过的所有点位编码:{Environment.NewLine}{string.Join("\r\n", points.Select(x=>x.point_code))}");
Log.Information($"经过的所有点位编码:{Environment.NewLine}{string.Join("\r\n", points.Select(x => x.point_code))}");
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致(预任务顺序)
if (points?.Count > 0)
@@ -139,7 +141,7 @@ namespace Tnb.WarehouseMgr
var sPoint = it.FirstOrDefault();
var ePoint = it.LastOrDefault();
Log.Information("ePoint?.point_code="+ ePoint?.point_code);
Log.Information("ePoint?.point_code=" + ePoint?.point_code);
WmsPretaskH preTask = new();
preTask.org_id = _userManager.User.OrganizeId;