From f4b5b9acda31ad3908bb5cbb2c1910b7fb982bca Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:55:44 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 223 insertions(+), 17 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 c82f6bb..ed76f00 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"
@@ -5,11 +5,15 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
+ /// <summary>
+ /// 浠诲姟
+ /// </summary>
[Route("api/Task")]
[ApiController]
public class TaskController : ApiBaseController<ITaskService, Dt_Task>
@@ -18,26 +22,88 @@
{
}
- /// <summary>
- /// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
- public WebResponseContent PushTasksToWCS()
- {
- return Service.PushTasksToWCS();
- }
+ ///// <summary>
+ ///// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
+ //public WebResponseContent PushTasksToWCS()
+ //{
+ // return Service.PushTasksToWCS();
+ //}
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟
/// </summary>
- /// <param name="palletCode"></param>
- /// <param name="stationCode"></param>
+ /// <param name="saveModel"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
- public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
+ public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
{
- return Service.RequestInboundTask(palletCode, stationCode);
+ return Service.RequestInboundTask(saveModel);
+ }
+
+ /// <summary>
+ /// 绌虹鍏ュ簱
+ /// </summary>
+ /// <param name="barcode">鎵樼洏鍙�</param>
+ /// <param name="address">鍦板潃</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("InEmpty"), AllowAnonymous]
+ public WebResponseContent InEmpty(string barcode, string address, int WarehouseId)
+ {
+ return Service.InEmpty(barcode, address, WarehouseId);
+ }
+
+ /// <summary>
+ /// 绌虹鍑哄簱
+ /// </summary>
+ /// <param name="qty">鏁伴噺</param>
+ /// <param name="address">鍦板潃</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutEmpty"), AllowAnonymous]
+ public WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode)
+ {
+ return Service.OutEmpty(qty, address, WarehouseId, barcode);
+ }
+
+ /// <summary>
+ /// WCS鐢宠鍏ュ簱浠诲姟(鍒嗛厤璐т綅)
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ {
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
+ }
+
+ /// <summary>
+ /// WCS鐢宠鍏ュ簱浠诲姟(涓嶅垎閰嶈揣浣�)
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string 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>
@@ -45,12 +111,24 @@
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous]
public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
{
return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AssignInboundTaskLocationByHeight"), AllowAnonymous]
+ public WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType)
+ {
+ return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
/// <summary>
@@ -71,9 +149,21 @@
/// <param name="stockSelectViews"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews)
+ public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
{
return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
+ }
+
+ /// <summary>
+ /// 骞冲簱鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GeneratePKOutboundTask"), AllowAnonymous]
+ public WebResponseContent GeneratePKOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
+ {
+ return Service.GeneratePKOutboundTask(orderDetailId, stockSelectViews);
}
/// <summary>
@@ -82,9 +172,9 @@
/// <param name="keys"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int[] keys)
+ public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
{
- return Service.GenerateOutboundTask(keys);
+ return Service.GenerateOutboundTasks(keys);
}
/// <summary>
@@ -97,5 +187,121 @@
{
return Service.OutboundTaskCompleted(taskNum);
}
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="locationCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
+ public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ {
+ return Service.IsRelocation(taskNum, locationCode);
+ }
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
+ public WebResponseContent TaskCompleted(int taskNum)
+ {
+ return Service.TaskCompleted(taskNum);
+ }
+
+ /// <summary>
+ /// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
+ public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
+ {
+ return Service.PushTasksToWCSSingle(taskNum, agvDescription);
+ }
+ /// <summary>
+ /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Outbound"), AllowAnonymous]
+ public WebResponseContent Outbound(int id)
+ {
+ return Service.Outbound(id);
+ }
+
+ /// <summary>
+ /// 鍒嗛厤宸烽亾(甯︿换鍔″彿鍙婇珮搴�)
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <param name="taskNum"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AssignRoadwayByHeight"), AllowAnonymous]
+ public WebResponseContent AssignRoadwayByHeight([FromBody] List<string> roadwayNos, int taskNum, int heightType = 0)
+ {
+ 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>
+ /// 鍒嗛厤宸烽亾(甯︿换鍔″彿)
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNos"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AssignRoadway"), AllowAnonymous]
+ public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos)
+ {
+ return Service.AssignRoadway(taskNum, roadwayNos);
+ }
+
+ /// <summary>
+ /// 鍒嗛厤宸烽亾
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SingleAssignRoadway"), AllowAnonymous]
+ public WebResponseContent SingleAssignRoadway([FromBody] List<string> roadwayNos)
+ {
+ return Service.SingleAssignRoadway(roadwayNos);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <returns></returns>
+ [HttpPost, Route("HandSubstrateOut")]
+ public WebResponseContent HandSubstrateOut(int orderId)
+ {
+ return Service.HandSubstrateOut(orderId);
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵��
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UpdateTaskInfo"), AllowAnonymous]
+ public WebResponseContent UpdateTaskInfo([FromBody] WCSTaskDTO task)
+ {
+ return Service.UpdateTaskInfo(task);
+ }
}
}
--
Gitblit v1.9.3