From 6a9cbabce3dab5b74fa466d6f7ab27bd1a1be3cb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 11 十月 2025 14:16:50 +0800
Subject: [PATCH] 优化任务逻辑并新增文件与文档支持 移除字段 "生产产线" 相关代码，优化 AGV 同层搬运与入库任务逻辑，新增对写入信号的判断处理，提升任务执行可靠性。 新增 `HttpHelper.cs`、`TaskEnumHelper.cs`、`PDAController.cs` 等文件，调整文档布局，更新索引与视图状态。 清理无用代码，完善堆垛机任务完成逻辑，新增日志记录。 新增与数据库相关的二进制文件及 Excel 文件支持。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
index f07d2e9..5cc7a05 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
@@ -11,15 +11,11 @@
{
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IDt_TaskService _taskService;
- private readonly ILocationInfoService _locationService;
- public TaskController(IDt_TaskService taskService,
- IHttpContextAccessor httpContextAccessor,
- ILocationInfoService locationService) : base(taskService)
+ public TaskController(IDt_TaskService service,
+ IHttpContextAccessor httpContextAccessor) : base(service)
{
_httpContextAccessor = httpContextAccessor;
- _taskService = taskService;
- _locationService = locationService;
}
/// <summary>
@@ -31,10 +27,10 @@
//[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
{
- return await _taskService.CompleteAsync(taskNum);
+ return await Service.CompleteAsync(taskNum);
}
/// <summary>
- /// 璇锋眰浠诲姟宸烽亾
+ /// 璇锋眰鍏ュ簱浠诲姟
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
@@ -58,27 +54,15 @@
}
/// <summary>
- /// 绌烘墭鐩樺叆搴撹姹�
- /// </summary>
- /// <param name="input">璇锋眰鏁版嵁</param>
- /// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestTrayInTaskAsync")]
- [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
- public async Task<WebResponseContent> RequestTrayInTaskAsync([FromBody] RequestTaskDto input)
- {
- return await Service.RequestTrayInTaskAsync(input);
- }
-
- /// <summary>
/// 绌烘墭鐩樻弧鐩樺嚭搴撹姹�
/// </summary>
/// <param name="request">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestTrayOutTaskAsync")]
+ [HttpPost, AllowAnonymous, Route("RequestOutTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
- public async Task<WebResponseContent> RequestTrayOutTaskAsync([FromBody] RequestOutTaskDto request)
+ public async Task<WebResponseContent> RequestOutTaskAsync([FromBody] RequestTaskDto taskDto)
{
- return await Service.RequestTrayOutTaskAsync(request.Position, request.Tag, request.AreaCdoe, request.AreaCdoes, request.ProductionLine);
+ return await Service.RequestOutTaskAsync(taskDto);
}
/// <summary>
@@ -86,11 +70,43 @@
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("UpdateTaskStatus")]
+ [HttpPost,HttpGet,Route("UpdateTaskStatus") ,AllowAnonymous]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> UpdateTaskStatus([FromBody] UpdateStatusDto input)
{
return await Service.UpdateTaskStatus(input.TaskNum, input.TaskState);
}
+ /// <summary>
+ /// 璇锋眰璺ㄦゼ灞備换鍔�2
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("AcrossFloorTaskAsync")]
+ public async Task<WebResponseContent> AcrossFloorTaskAsync([FromBody] RequestAcrossFloorTaskDto taskDto)
+ {
+ return await Service.AcrossFloorTaskAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 璺ㄦゼ灞備换鍔¤姹�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestAcrossFloorTaskAsync")]
+ public async Task<WebResponseContent> RequestAcrossFloorTaskAsync([FromBody] RequestTaskDto taskDto)
+ {
+ return await Service.RequestAcrossFloorTaskAsync(taskDto);
+ }
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟璇锋眰
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestAGVCarryTaskAsync")]
+ public Task<WebResponseContent> RequestAGVCarryTaskAsync([FromBody] RequestTaskDto taskDto)
+ {
+ return Service.RequestAGVCarryTaskAsync(taskDto);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3