From fdf7bb595ee00e5fef7b4e110fbe32f637c069f6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 18 八月 2025 08:38:46 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 238 ++++++++--------------------------------------------------
1 files changed, 35 insertions(+), 203 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 2c768e0..1d03895 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -21,65 +21,6 @@
public TaskController(ITaskService service) : base(service)
{
}
-
- ///// <summary>
- ///// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
- ///// </summary>
- ///// <returns></returns>
- //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
- //public WebResponseContent PushTasksToWCS()
- //{
- // return Service.PushTasksToWCS();
- //}
-
- /// <summary>
- /// 鐢宠鍏ュ簱浠诲姟
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
- public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
- {
- 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,string materielBoxCode = "")
- {
- return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode, materielBoxCode);
- }
-
/// <summary>
/// WCS鐢宠鍏ュ簱浠诲姟(涓嶅垎閰嶈揣浣�)
/// </summary>
@@ -90,20 +31,6 @@
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>
@@ -130,74 +57,7 @@
{
return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("InboundTaskCompleted"), AllowAnonymous]
- public WebResponseContent InboundTaskCompleted(int taskNum)
- {
- return Service.InboundTaskCompleted(taskNum);
- }
-
- /// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
- 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>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
- {
- return Service.GenerateOutboundTasks(keys);
- }
- /// <summary>
- /// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
- /// </summary>
- /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
- /// <param name="StationCode">绔欏彴鍦板潃</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous]
- public async Task<WebResponseContent> OutProductTask([FromBody] int[] keys, string StationCode, int Grade)
- {
- return await Service.OutProductTask(keys, StationCode, Grade);
- }
- /// <summary>
- /// 鎴愬搧浣欐枡閫�搴撳叆浠�
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("BackProductTask"), AllowAnonymous]
- public WebResponseContent BackProductTask(string barCode, string startPoint)
- {
- return Service.BackProductTask(barCode, startPoint);
- }
+
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
/// </summary>
@@ -208,34 +68,6 @@
public WebResponseContent EmptyBackTask(string barCode, string startPoint)
{
return Service.EmptyBackTask(barCode, startPoint);
- }
- /// <summary>
- /// 鐢熸垚鎴愬搧鎻愬簱浠诲姟
- /// </summary>
- [HttpPost, HttpGet, Route("OutProRworkTask"), AllowAnonymous]
- public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode, int Grade)
- {
- return await Service.OutProductTask(keys, StationCode, Grade);
- }
- ///// <summary>
- ///// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
- ///// </summary>
- ///// <param name="keys"></param>
- ///// <returns></returns>
- //[HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
- //public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
- //{
- // return Service.MESPPGenerateOutboundTasks(keys);
- //}
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous]
- public WebResponseContent OutboundTaskCompleted(int taskNum)
- {
- return Service.OutboundTaskCompleted(taskNum);
}
/// <summary>
@@ -297,19 +129,6 @@
}
/// <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>
@@ -333,17 +152,6 @@
}
/// <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>
@@ -353,26 +161,50 @@
{
return Service.UpdateTaskInfo(task);
}
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
+ /// </summary>
+ /// <param name="stationCode">璧风偣</param>
+ /// <param name="palletCode">鎵樼洏</param>
+ /// <returns></returns>
+ [HttpPost,HttpGet, Route("RequestYLWMSTaskSimple"), AllowAnonymous]
+ public WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode)
+ {
+ return Service.RequestYLWMSTaskSimple(stationCode,palletCode);
+ }
/// <summary>
- /// PP浠揂GV鎼繍浠诲姟
+ /// 鎴愬搧鍑哄簱浠诲姟璇锋眰
/// </summary>
- /// <param name="task"></param>
/// <returns></returns>
- [HttpPost, Route("AGVTasks"), AllowAnonymous]
- public WebResponseContent AGVTasks([FromBody] SaveModel saveModel)
+ [HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous]
+ public WebResponseContent RequestCPWMSTaskOut(int Count)
{
- return Service.AGVTasks(saveModel);
+ return Service.RequestCPWMSTaskOut(Count);
}
/// <summary>
- /// 鎴愬搧鎸囧畾鍑哄簱
+ /// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
- /// <param name="task"></param>
+ /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
+ /// <param name="materielWide">鐗╂枡骞呭</param>
+ /// <param name="Count">鍗锋暟</param>
/// <returns></returns>
- [HttpPost, Route("OutProductSelect"), AllowAnonymous]
- public WebResponseContent OutProductSelect(int orderDetailId,[FromBody] List<ProStockViewDTO> proStockViews)
+ [HttpPost, HttpGet, Route("RequestYLWMSTaskOut"), AllowAnonymous]
+ public WebResponseContent RequestYLWMSTaskOut(string materielCode,int materielWide, int Count)
{
- return Service.OutProductSelect(orderDetailId, proStockViews);
+ return Service.RequestYLWMSTaskOut(materielCode, materielWide, Count);
+ }
+ /// <summary>
+ /// 鍘熸枡绉诲簱浠诲姟
+ /// </summary>
+ /// <param name="startAddress"></param>
+ /// <param name="endAddress"></param>
+ /// <param name="roadWay"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("Relocation"), AllowAnonymous]
+ public WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay)
+ {
+ return Service.IsRelocation(startAddress, endAddress, roadWay);
}
}
}
--
Gitblit v1.9.3