fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -0,0 +1,173 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using HHWMS.Web.Models;
|
||||
using HHWMS.Web.Models.Agv;
|
||||
using HHWMS.Web.Services.Agv;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Quartz;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 定时下发 Job:周期扫描 新建(0)/异常(90) 任务自动下发。
|
||||
/// 启停方式:在【系统管理→定时任务】页面新增本条记录,Cron 建议 0 */2 * * * ?(每 2 分钟)。
|
||||
/// 依赖 DispatchTaskAsync 内部的 FOR UPDATE 行锁 + 状态校验,天然防并发/防重复下发。
|
||||
/// 日志双通道:Console 直写控制台(现场直跑 exe 可直接观察是否触发),Wtm.DoLog 写 ActionLogs 表。
|
||||
/// </summary>
|
||||
[PersistJobDataAfterExecution]
|
||||
[DisallowConcurrentExecution]
|
||||
public class AgvTaskDispatchJob : WtmJob
|
||||
{
|
||||
// 无参构造 —— WtmJob 反射创建 Job 实例必须有无参构造
|
||||
public AgvTaskDispatchJob() { }
|
||||
|
||||
public override async Task Execute(IJobExecutionContext context)
|
||||
{
|
||||
// 每次触发必输出心跳行:用于区分「调度没触发」和「触发了但没任务」
|
||||
WriteLog($"Job触发,计划时间 {Fmt(context.ScheduledFireTimeUtc)},下次触发 {Fmt(context.NextFireTimeUtc)}");
|
||||
try
|
||||
{
|
||||
var sp = context.JobDetail.JobDataMap.Get("Sp") as IServiceProvider;
|
||||
if (sp == null)
|
||||
{
|
||||
WriteLog("错误:未能从 JobDataMap 获取 IServiceProvider");
|
||||
DoJobLog("AGV定时下发Job异常", "error", "未能从 JobDataMap 获取 IServiceProvider");
|
||||
return;
|
||||
}
|
||||
// AgvTaskService 为 Scoped 服务,root provider 直接解析会抛
|
||||
// Cannot resolve scoped service(ValidateScopes),必须创建独立作用域
|
||||
using (var scope = sp.CreateScope())
|
||||
{
|
||||
var service = scope.ServiceProvider.GetService(typeof(AgvTaskService)) as AgvTaskService;
|
||||
if (service == null)
|
||||
{
|
||||
WriteLog("错误:DI 容器中未注册 AgvTaskService");
|
||||
DoJobLog("AGV定时下发Job异常", "error", "DI 容器中未注册 AgvTaskService");
|
||||
return;
|
||||
}
|
||||
WriteLog("依赖解析成功:IServiceScope / AgvTaskService 均可用");
|
||||
await DispatchBatch(context, service);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 输出完整异常堆栈到控制台,避免只有 Message 无法定位
|
||||
WriteLog($"Job执行异常:{ex}");
|
||||
DoJobLog("AGV定时下发Job异常", "error", ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 扫描待下发任务并逐条下发,输出每条结果与汇总
|
||||
/// </summary>
|
||||
private async Task DispatchBatch(IJobExecutionContext context, AgvTaskService service)
|
||||
{
|
||||
var unitWork = new UnitWork(Wtm);
|
||||
const int batchSize = 20;
|
||||
|
||||
var tasks = unitWork.Find<AgvTask>(x =>
|
||||
x.AgvStatus == AgvTaskStatusEnum.新建
|
||||
|| x.AgvStatus == AgvTaskStatusEnum.异常)
|
||||
.OrderByDescending(x => x.Priority)
|
||||
.ThenBy(x => x.CreateTime)
|
||||
.Take(batchSize)
|
||||
.ToList();
|
||||
|
||||
WriteLog($"扫描完成:待下发任务 {tasks.Count} 条(状态=新建/异常,批量上限 {batchSize})"
|
||||
+ (tasks.Count > 0 ? ",任务号:" + string.Join(",", tasks.Select(t => t.TaskNo)) : ""));
|
||||
|
||||
if (tasks.Count == 0)
|
||||
{
|
||||
UpdateJobFireTime(unitWork, context);
|
||||
return;
|
||||
}
|
||||
|
||||
int success = 0, fail = 0;
|
||||
foreach (var task in tasks)
|
||||
{
|
||||
try
|
||||
{
|
||||
await service.DispatchTaskAsync(task.TaskNo);
|
||||
success++;
|
||||
WriteLog($"下发成功:{task.TaskNo}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
fail++;
|
||||
WriteLog($"下发失败:{task.TaskNo},原因:{ex.Message}");
|
||||
DoJobLog($"AGV定时下发失败:{task.TaskNo}", task.TaskNo, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
WriteLog($"本轮执行结束:共 {tasks.Count} 条,成功 {success},失败 {fail}");
|
||||
if (success > 0 || fail > 0)
|
||||
{
|
||||
DoJobLog("AGV定时下发", $"batch={tasks.Count}", $"ok={success},fail={fail}");
|
||||
}
|
||||
|
||||
UpdateJobFireTime(unitWork, context);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新 SysJob 上 LastFireTime / NextFireTime;内部异常仅记日志,不影响下发主流程
|
||||
/// </summary>
|
||||
private static void UpdateJobFireTime(UnitWork unitWork, IJobExecutionContext context)
|
||||
{
|
||||
try
|
||||
{
|
||||
var job = unitWork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||
if (job == null)
|
||||
{
|
||||
WriteLog($"提示:SysJob 表中未找到 JobName={context.JobDetail.Key.Name} 的记录,LastFireTime 未更新");
|
||||
return;
|
||||
}
|
||||
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(
|
||||
context.FireTimeUtc.DateTime, TimeZoneInfo.Local);
|
||||
if (context.NextFireTimeUtc != null)
|
||||
{
|
||||
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(
|
||||
context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local);
|
||||
}
|
||||
unitWork.Update(job);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
WriteLog($"更新 LastFireTime 失败(不影响下发):{ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 写 ActionLogs 日志;Wtm 不可用时静默跳过(控制台日志已兜底)
|
||||
/// </summary>
|
||||
private void DoJobLog(string title, string request, string result)
|
||||
{
|
||||
try
|
||||
{
|
||||
Wtm.DoLog(title, ActionLogTypesEnum.Job, "AgvTaskDispatchJob", request: request, result: result);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Wtm 为 null 等场景忽略,控制台日志已兜底
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 控制台直出日志(带时间戳),用于确认 Job 是否真实触发
|
||||
/// </summary>
|
||||
private static void WriteLog(string message)
|
||||
{
|
||||
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] [AgvTaskDispatchJob] {message}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 可空时间格式化(本地时间),空值显示 -
|
||||
/// </summary>
|
||||
private static string Fmt(DateTimeOffset? time)
|
||||
{
|
||||
return time.HasValue ? time.Value.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss") : "-";
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user