From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +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 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 98 insertions(+), 12 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 bfffcd7..21ebc59 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,14 @@
{
return Service.RequestInboundTask(saveModel);
}
-
+ /// <summary>
+ /// 鏌ヨ璐ㄦ鏁伴噺
+ /// </summary>
+ [HttpPost, HttpGet, Route("InQualityConfirm"), AllowAnonymous]
+ public WebResponseContent InQualityConfirm(string palletCode)
+ {
+ return Service.InQualityConfirm(palletCode);
+ }
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -75,9 +82,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 +137,11 @@
{
return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
-
+ [HttpPost, HttpGet, Route("RequestZHInboundTask"), AllowAnonymous]
+ public WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot)
+ {
+ return Service.RequestZHInboundTask(agvTaskCode,palletCode,palletType,materialLot);
+ }
/// <summary>
/// 鍏ュ簱浠诲姟瀹屾垚
/// </summary>
@@ -176,7 +187,57 @@
{
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>
+ ///// <param name="keys"></param>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
+ //public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
+ //{
+ // return Service.MESPPGenerateOutboundTasks(keys);
+ //}
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
/// </summary>
@@ -206,11 +267,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>
@@ -218,9 +278,9 @@
/// <param name="agvDescription"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
- public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
+ public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "")
{
- return Service.PushTasksToWCSSingle(taskNum, agvDescription);
+ return Service.PushTasksToWCSSingle(taskNum, agvDescription, agvtaskNum);
}
/// <summary>
/// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
@@ -266,9 +326,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>
@@ -314,5 +374,31 @@
{
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);
+ }
+ /// <summary>
+ /// 閫夊畾搴撳瓨鐢熸垚鐩樼偣鍗曞嚭搴�
+ /// </summary>
+ [HttpPost, Route("TakeOutbound"), AllowAnonymous]
+ public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews)
+ {
+ return Service.TakeOutbound(stockViews);
+ }
}
}
--
Gitblit v1.9.3