From f250fe4befac5c9bacaa6eae9fa87738a70663dd Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期三, 15 一月 2025 08:45:54 +0800
Subject: [PATCH] 增加AGV重置按钮
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index 1ad1b94..3996efd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -62,11 +62,22 @@
}
/// <summary>
- /// 浠诲姟鍙栨秷
+ /// 鎺ユ敹WCS浜哄伐浠诲姟淇℃伅
+ /// </summary>
+ /// <param name="taskDTO">WCS浠诲姟瀵硅薄</param>
+ /// <returns>杩斿洖澶勭悊缁撴灉</returns>
+ [HttpPost, Route("ReceiveWCSTask"), AllowAnonymous]
+ public WebResponseContent ReceiveWCSTask([FromBody] MESTaskDTO taskDTO)
+ {
+ return Service.ReceiveWCSTask(taskDTO);
+ }
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷(鍫嗗灈鏈哄洖瑙ｅ喅涓嶄簡鐨勬晠闅滈渶娓呴櫎浠诲姟锛屾竻闄や换鍔″悗锛岄渶鍦╓CS涓婂彇娑堜换鍔�)
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
- [Route("CancelTask")]
+ [HttpPost,Route("CancelTask")]
public WebResponseContent CancelTask(int taskNum)
{
return Service.CancelTask(taskNum);
@@ -74,14 +85,25 @@
}
/// <summary>
- /// 浠诲姟寮哄埗瀹屾垚
+ /// 浠诲姟寮哄埗瀹屾垚 锛堝爢鍨涙満瀹為檯宸插畬鎴愪换鍔★紝WCS鏈敹鍒板畬鎴愪俊鍙锋垨鍏朵粬鏈煡鍘熷洜瀵艰嚧WCS浠诲姟鏈畬鎴愶紝鍙互鎵ц璇ユ柟娉曞己鍒跺畬鎴愪换鍔★級
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ForceCompleteTask")]
+ [HttpPost, Route("ForceCompleteTask")]
public WebResponseContent ForceCompleteTask (int taskNum)
{
- return null;
+ return Service.ForceCompleteTask(taskNum);
+ }
+
+ /// <summary>
+ /// AGV鍏佽杩涘叆鏍囧織閲嶇疆0
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AGVResetTask")]
+ public WebResponseContent AGVResetTask()
+ {
+ return Service.AGVResetTask();
}
}
}
--
Gitblit v1.9.3