From 659b0ed98c87b164b96ac43b3c0c8a7d2f975bf2 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 28 二月 2025 10:51:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 12659d5..c50d709 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -89,7 +89,21 @@
[HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
{
- return Service.DeviceRequestInboundTask(stationCode, palletCode);
+ return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="roadwayNos"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTaskByRoadways"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, int heightType, [FromBody] List<string> roadwayNos)
+ {
+ return Service.DeviceRequestInboundTaskByRoadways(stationCode, palletCode, roadwayNos, heightType);
}
/// <summary>
@@ -158,9 +172,9 @@
/// <param name="keys"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask([FromBody] int[] keys)
+ public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
{
- return Service.GenerateOutboundTask(keys);
+ return Service.GenerateOutboundTasks(keys);
}
/// <summary>
@@ -229,7 +243,20 @@
[HttpPost, Route("AssignRoadwayByHeight"), AllowAnonymous]
public WebResponseContent AssignRoadwayByHeight([FromBody] List<string> roadwayNos, int taskNum, int heightType = 0)
{
- return Service.AssignRoadway(roadwayNos, taskNum, heightType);
+ return Service.AssignRoadwayByHeight(roadwayNos, taskNum, heightType);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AssignRoadwayByHeightAndCode"), AllowAnonymous]
+ public WebResponseContent AssignRoadwayByHeightAndCode([FromBody] List<string> roadwayNos, string palletCode, int heightType = 0)
+ {
+ return Service.AssignRoadwayByHeightAndCode(roadwayNos, palletCode, heightType);
}
/// <summary>
@@ -239,9 +266,9 @@
/// <param name="roadwayNos"></param>
/// <returns></returns>
[HttpPost, Route("AssignRoadway"), AllowAnonymous]
- public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos)
+ public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos,int heightType)
{
- return Service.AssignRoadway(taskNum, roadwayNos);
+ return Service.AssignRoadway(taskNum, roadwayNos, heightType);
}
/// <summary>
@@ -250,9 +277,9 @@
/// <param name="roadwayNos"></param>
/// <returns></returns>
[HttpPost, Route("SingleAssignRoadway"), AllowAnonymous]
- public WebResponseContent AssignRoadway([FromBody] List<string> roadwayNos)
+ public WebResponseContent SingleAssignRoadway([FromBody] List<string> roadwayNos)
{
- return Service.AssignRoadway(roadwayNos);
+ return Service.SingleAssignRoadway(roadwayNos);
}
/// <summary>
@@ -276,5 +303,16 @@
{
return Service.UpdateTaskInfo(task);
}
+
+ /// <summary>
+ /// PP浠揂GV鎼繍浠诲姟
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AGVTasks"), AllowAnonymous]
+ public WebResponseContent AGVTasks([FromBody] SaveModel saveModel)
+ {
+ return Service.AGVTasks(saveModel);
+ }
}
}
--
Gitblit v1.9.3