From 3443d00c1c23f84d8559e802a27eb9ba7ff0858a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 10 六月 2025 16:32:34 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 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 f814880..fe6c647 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"
@@ -42,7 +42,7 @@
{
return Service.RequestInboundTask(saveModel);
}
-
+
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -75,9 +75,9 @@
/// <param name="palletCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
- public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "")
{
- return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode, materielBoxCode);
}
/// <summary>
@@ -130,7 +130,10 @@
{
return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
-
+ public WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot)
+ {
+ return Service.RequestZHInboundTask(agvTaskCode,palletCode,palletType,materialLot);
+ }
/// <summary>
/// 鍏ュ簱浠诲姟瀹屾垚
/// </summary>
@@ -176,6 +179,47 @@
{
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>
+ /// <param name="barCode"></param>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
+ 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>
@@ -215,11 +259,10 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public WebResponseContent TaskCompleted(int taskNum)
+ public async Task<WebResponseContent> TaskCompleted(int taskNum)
{
- return Service.TaskCompleted(taskNum);
+ return await Service.TaskCompleted(taskNum);
}
-
/// <summary>
/// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
/// </summary>
@@ -323,5 +366,23 @@
{
return Service.AGVTasks(saveModel);
}
+ /// <summary>
+ /// 鎴愬搧鎸囧畾鍑哄簱
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("OutProductSelect"), AllowAnonymous]
+ public WebResponseContent OutProductSelect(int orderDetailId,[FromBody] List<ProStockViewDTO> proStockViews)
+ {
+ return Service.OutProductSelect(orderDetailId, proStockViews);
+ }
+ /// <summary>
+ /// 闃荤剨鎵规鐗╂枡鏌ヨ
+ /// </summary>
+ [HttpPost, Route("GetZHMesMaterialLot"), AllowAnonymous]
+ public WebResponseContent GetZHMesMaterialLot(string materialLot)
+ {
+ return Service.GetZHMesMaterialLot(materialLot);
+ }
}
}
--
Gitblit v1.9.3