From 734f49c3f74e4a46cfb5892ce60dbf1bb86e74ab Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 22 七月 2025 19:14:39 +0800
Subject: [PATCH] 出入库流程
---
WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 305fbea..3d429ed 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -5,6 +5,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using static WIDESEA_ITaskInfoService.ITaskService;
@@ -23,10 +24,10 @@
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- [HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public WebResponseContent TaskCompleted(int taskNum)
+ [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
+ public async Task<WebResponseContent> TaskCompleted(int taskNum)
{
- return Service.TaskCompleted(taskNum);
+ return await Service.TaskCompleted(taskNum);
}
[HttpPost, Route("GenerateOutboundTask"), AllowAnonymous]
@@ -43,6 +44,17 @@
public WebResponseContent InboundRequest(string stationCode, string roadwayNo, string palletCode)
{
return Service.InboundRequest(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>
/// 鍒ゆ柇宸烽亾鍐呯Щ搴�
@@ -70,7 +82,7 @@
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- [HttpPost, Route("InboundTaskCompleted"), AllowAnonymous]
+ [HttpPost, HttpGet, Route("InboundTaskCompleted"), AllowAnonymous]
public WebResponseContent InboundTaskCompleted(int taskNum)
{
return Service.InboundTaskCompleted(taskNum);
@@ -117,10 +129,45 @@
return Service.InventoryIn(name, qty);
}
- [HttpPost,Route("UpdateTaskStatus") ,AllowAnonymous]
+ [HttpPost, Route("UpdateTaskStatus"), AllowAnonymous]
public WebResponseContent UpdateTaskStatus(int tasknum, int tasktype)
{
return Service.UpdateTaskStatus(tasknum, tasktype);
}
+ /// <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, int heightType)
+ {
+ return Service.AssignRoadway(taskNum, roadwayNos, heightType);
+ }
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="roadwayNo">宸烽亾鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous]
+ public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
+ {
+ return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
+ }
+
+
+ /// <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