From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +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 | 186 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 186 insertions(+), 0 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 ea5eb3e..db78b1a 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"
@@ -1,14 +1,19 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
+ /// <summary>
+ /// 浠诲姟
+ /// </summary>
[Route("api/Task")]
[ApiController]
public class TaskController : ApiBaseController<ITaskService, Dt_Task>
@@ -17,5 +22,186 @@
{
}
+ ///// <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);
+ }
+
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ {
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
+ }
+
+ /// <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="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="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
+ public WebResponseContent GenerateOutboundTask([FromBody] int[] keys)
+ {
+ return Service.GenerateOutboundTask(keys);
+ }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous]
+ public WebResponseContent OutboundTaskCompleted(int taskNum)
+ {
+ return Service.OutboundTaskCompleted(taskNum);
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="locationCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
+ public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ {
+ return Service.IsRelocation(taskNum, locationCode);
+ }
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
+ public WebResponseContent TaskCompleted(int taskNum)
+ {
+ return Service.TaskCompleted(taskNum);
+ }
+
+ /// <summary>
+ /// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
+ public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
+ {
+ return Service.PushTasksToWCSSingle(taskNum, agvDescription);
+ }
+ /// <summary>
+ /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Outbound"), AllowAnonymous]
+ public WebResponseContent Outbound(int id)
+ {
+ return Service.Outbound(id);
+ }
+
+ /// <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)
+ {
+ return Service.AssignRoadway(taskNum, roadwayNos);
+ }
+
+ [HttpPost, Route("SingleAssignRoadway"), AllowAnonymous]
+ public WebResponseContent AssignRoadway([FromBody] List<string> roadwayNos)
+ {
+ return Service.AssignRoadway(roadwayNos);
+ }
+
+ /// <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