From 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 13 十一月 2025 17:35:36 +0800
Subject: [PATCH] 新增移库页面与WebSocket支持，优化任务逻辑新增移库页面支持移库任务输入与提交。新增 WebSocket 支持（`websocket.js`、`WebSocketSetup.cs`），实现实时通信功能。 在任务状态枚举中新增 AGV 移库任务状`TaskStatusEnum.cs`）- 重构库存数据展示页面（`Home.vue`），新增数据总览与图表展示功能。 - 新增库存数据接口（`StockInfoService.cs`、`StockInfoController.cs`），支持库存统计与展示。 - 优化任务状态管理逻辑，支持 AGV 移库任务（`Dt_TaskService.cs`）。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 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 c3cdeb3..8f389e1 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"
@@ -1,4 +1,5 @@
-锘縰sing WIDESEA_DTO;
+锘縰sing Org.BouncyCastle.Asn1.Mozilla;
+using WIDESEA_DTO;
namespace WIDESEA_WMSServer.Controllers.Task;
@@ -62,16 +63,11 @@
return await Service.RequestInboundTaskAsync(input);
}
- /// <summary>
- /// 鏇存柊璐т綅浠诲姟鐘舵�佸埌涓嬩竴涓妭鐐�
- /// </summary>
- /// <param name="input">璇锋眰鏁版嵁</param>
- /// <returns></returns>
- [HttpPost, HttpGet, AllowAnonymous, Route("RequestLocationAsync")]
+ [HttpPost, HttpGet, AllowAnonymous, Route("RequestRelocationTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
- public async Task<WebResponseContent> RequestLocationAsync([FromBody] RequestTaskDto input)
+ public Task<WebResponseContent> RequestRelocationTaskAsync(string SourceAddress, string TargetAddress)
{
- return await Service.RequestLocationAsync(input);
+ return Service.RequestRelocationTaskAsync(SourceAddress, TargetAddress);
}
/// <summary>
@@ -93,9 +89,23 @@
/// <returns></returns>
[HttpPost, HttpGet, AllowAnonymous, Route("OutBoundTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
- public Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
+ public Task<WebResponseContent> OutBoundTaskAsync(string palletCode, string remark)
{
- return Service.OutBoundTaskAsync(palletCode);
+ return Service.OutBoundTaskAsync(palletCode, remark);
+ }
+
+ [HttpPost, HttpGet, AllowAnonymous, Route("OtherOutBoundTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
+ public Task<WebResponseContent> OtherOutBoundTaskAsync([FromBody] List<DtStockInfoDetail> details)
+ {
+ return Service.OtherOutBoundTaskAsync(details);
+ }
+
+ [HttpPost, HttpGet, AllowAnonymous, Route("HandAllocateOutBoundTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
+ public Task<WebResponseContent> HandAllocateOutBoundTaskAsync([FromBody] List<DtStockInfoDetail> details)
+ {
+ return Service.HandAllocateOutBoundTaskAsync(details);
}
/// <summary>
@@ -144,16 +154,19 @@
}
[HttpPost, AllowAnonymous, Route("AGVIsNeedRelocationAsync")]
- [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
public async Task<WebResponseContent> AGVIsNeedRelocationAsync([FromBody] RequestTaskDto taskDto)
{
return await Service.AGVIsNeedRelocationAsync(taskDto);
}
- [HttpPost, AllowAnonymous, Route("SendERPTaskCompletion")]
- [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
- public Task<WebResponseContent> ERPAllocate(DtStockInfo stockInfo)
+ [HttpPost, AllowAnonymous, Route("UpdateStartLocationInfo")]
+ public async Task<WebResponseContent> UpdateStartLocationInfo([FromBody]Dt_Task task)
{
- return Service.ERPAllocate(stockInfo);
+ return await Service.UpdateStartLocationInfo(task);
+ }
+ [HttpPost,HttpGet, AllowAnonymous, Route("RequestLocation")]
+ public Task<WebResponseContent> RequestLocation(string palletCode)
+ {
+ return Service.RequestLocation(palletCode);
}
}
\ No newline at end of file
--
Gitblit v1.9.3