From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DispatchInfoController.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DispatchInfoController.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DispatchInfoController.cs
index 59046ac..4bc52e8 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DispatchInfoController.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DispatchInfoController.cs
@@ -1,5 +1,7 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
@@ -10,8 +12,16 @@
[ApiController]
public class DispatchInfoController : ApiBaseController<IDispatchInfoService, Dt_DispatchInfo>
{
- public DispatchInfoController(IDispatchInfoService service) : base(service)
+ private readonly IDispatchInfoService _dispatchInfoService;
+ public DispatchInfoController(IDispatchInfoService service, IDispatchInfoService dispatchInfoService) : base(service)
{
+ _dispatchInfoService = dispatchInfoService;
+ }
+
+ [HttpGet("GetDispatchInfosAsync"),AllowAnonymous]
+ public Task<WebResponseContent> GetDispatchInfosAsync()
+ {
+ return _dispatchInfoService.GetDispatchInfosAsync();
}
}
}
--
Gitblit v1.9.3