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/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
index acf1877..eee0b1a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
@@ -1,5 +1,7 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing AutoMapper.Configuration.Annotations;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
using WIDESEA_DTO;
using WIDESEA_IStoragIntegrationServices;
@@ -10,28 +12,53 @@
public class MCSController : Controller
{
private readonly IMCSService _MCSService;
+ private readonly IHttpContextAccessor _httpContextAccessor;
- public MCSController(IMCSService MCSService) { _MCSService = MCSService; }
+ public MCSController(IMCSService MCSService, IHttpContextAccessor httpContextAccessor)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _MCSService = MCSService;
+ }
- [HttpPost("NotifyFinishTest")]
+ /// <summary>
+ /// 鍒嗗娴嬭瘯瀹屾垚閫氱煡
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("NotifyFinishTest"), AllowAnonymous]
public WebResponseContent NotifyFinishTest([FromBody] object input)
{
return _MCSService.NotifyFinishTest(input);
}
- [HttpPost("RequestChangeLocation")]
+ /// <summary>
+ /// 璇锋眰绉诲簱
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("RequestChangeLocation"), AllowAnonymous]
public WebResponseContent RequestChangeLocation([FromBody] object input)
{
return _MCSService.RequestChangeLocation(input);
}
- [HttpPost("ModifyAccessStatus")]
+ /// <summary>
+ /// 鍒嗗搴撲綅鍚屾
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyAccessStatus"), AllowAnonymous]
public WebResponseContent ModifyAccessStatus([FromBody] object input)
{
return _MCSService.ModifyAccessStatus(input);
}
- [HttpPost("RequestCellInfo")]
+ /// <summary>
+ /// 鍒嗗鑾峰彇搴撲綅鎵樼洏
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("RequestCellInfo"), AllowAnonymous]
public object RequsetCellInfo([FromBody] object input)
{
return _MCSService.RequsetCellInfo(input);
--
Gitblit v1.9.3