From f7ad3416dfc1558be842f3190688adc9a5a8933d Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期日, 18 一月 2026 14:51:23 +0800
Subject: [PATCH] 添加盘点，合托流程
---
WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 287 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 196 insertions(+), 91 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 5d833d4..82a3f1a 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;
@@ -18,136 +19,240 @@
public TaskController(ITaskService service) : base(service)
{
}
-
- [HttpPost, Route("GenerateInboundTask")]
- public WebResponseContent GenerateInboundTask(string stationCode, int inboundType, string palletCode)
+ /// <summary>
+ /// WCS鍙嶉浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
+ public async Task<WebResponseContent> TaskCompleted(int taskNum)
{
- return Service.GenerateInboundTask(stationCode, inboundType, palletCode);
- }
-
- [HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public WebResponseContent TaskCompleted(int taskNum)
- {
- return Service.TaskCompleted(taskNum);
+ return await Service.TaskCompleted(taskNum);
}
[HttpPost, Route("GenerateOutboundTask"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int id, [FromBody] List<StockSelectViewDTO> stockSelectViews)
+ public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
{
- return Service.GenerateOutboundTask(id, stockSelectViews);
+ return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
}
- //[HttpPost, Route("GenerateOutboundTasks")]
- //public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys)
- //{
- // return Service.GenerateOutboundTask(keys);
- //}
- [HttpPost, Route("PalletOutboundTask")]
- public WebResponseContent PalletOutboundTask(string roadwayNo, string endStation)
+ [HttpPost, Route("WMSGenerateOutboundTask"), AllowAnonymous]
+ public WebResponseContent WMSGenerateOutboundTask([FromBody] int[] keys)
{
- return Service.PalletOutboundTask(roadwayNo, endStation);
- }
- [HttpPost, Route("InboundRequest"),AllowAnonymous]
- public WebResponseContent InboundRequest([FromBody] SaveModel saveModel)
- {
- return Service.InboundRequest(saveModel);
+ return Service.WMSGenerateOutboundTask(keys);
}
+ [HttpPost, Route("WMSGenerateNewOutboundTask"), AllowAnonymous]
+ public WebResponseContent WMSGenerateNewOutboundTask([FromBody] int[] keys)
+ {
+ return Service.WMSGenerateNewOutboundTask(keys);
+ }
+
+ [HttpPost, Route("WMSGenerateSTOutboundTask"), AllowAnonymous]
+ public WebResponseContent WMSGenerateSTOutboundTask([FromBody] int[] keys)
+ {
+ return Service.WMSGenerateSTOutboundTask(keys);
+ }
+ /// <summary>
+ /// SMOM鐩樼偣浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SMOMGenerateSTOutboundTask"), AllowAnonymous]
+ public WebResponseContent SMOMGenerateSTOutboundTask([FromBody] int[] keys)
+ {
+ return Service.SMOMGenerateSTOutboundTask(keys);
+ }
+
+ /// <summary>
+ /// WCS鐢宠鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InboundRequest"), AllowAnonymous]
+ 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, int heightType)
+ {
+ return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode, heightType);
+ }
+
+ [HttpPost, HttpGet, Route("CPDeviceRequestInboundTaskSimple"), AllowAnonymous]
+ public WebResponseContent CPDeviceRequestInboundTaskSimple(string stationCode, string palletCode, int heightType, string courceAddress)
+ {
+ return Service.CPDeviceRequestInboundTaskSimple(stationCode, palletCode, heightType, courceAddress);
+ }
+
+ /// <summary>
+ /// 鐢宠宸烽亾
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ApplyLocation"), AllowAnonymous]
+ public WebResponseContent ApplyLocation(string palletCode)
+ {
+ return Service.ApplyLocation(palletCode);
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇宸烽亾鍐呯Щ搴�
+ /// </summary>
+ /// <param name="TaskNum"></param>
+ /// <param name="SourceAddress"></param>
+ /// <returns></returns>
[HttpGet, Route("IsRelocations"), AllowAnonymous]
public WebResponseContent IsRelocations(int TaskNum, string SourceAddress)
{
return Service.IsRelocations(TaskNum, SourceAddress);
}
-
- //[HttpPost, Route("GenerateInventoryInformation"), AllowAnonymous]
- //public WebResponseContent GenerateInventoryInformation([FromBody] GenerateInv generate)
- //{
- // return Service.GenerateInventoryInformation(generate);
- //}
-
- [HttpPost, Route("ManualOutbound"), AllowAnonymous]
- public WebResponseContent ManualOutbound([FromBody] SaveModel saveModel)
- {
- return Service.ManualOutbound(saveModel);
- }
- [HttpPost, Route("ManualOutbound2"), AllowAnonymous]
- public WebResponseContent ManualOutbound2([FromBody] SaveModel saveModel)
- {
- return Service.ManualOutbound2(saveModel);
- }
- [HttpPost, Route("ManualOutbound3"), AllowAnonymous]
- public WebResponseContent ManualOutbound3([FromBody] SaveModel saveModel)
- {
- return Service.ManualOutbound3(saveModel);
- }
- [HttpPost, Route("ManualOutbound4"), AllowAnonymous]
- public WebResponseContent ManualOutbound4([FromBody] SaveModel saveModel)
- {
- return Service.ManualOutbound4(saveModel);
- }
- [HttpPost, Route("ManualOutboundDeleteinventory"), AllowAnonymous]
- public WebResponseContent ManualOutboundDeleteinventory([FromBody] SaveModel saveModel)
- {
- return Service.ManualOutboundDeleteinventory(saveModel);
- }
- //[HttpPost, Route("Empty_outbound"), AllowAnonymous]
- //public WebResponseContent Empty_outbound([FromBody] GenerateInv generate)
- //{
- // return Service.Empty_outbound(generate);
- //}
- //[HttpPost, Route("Queryinventory"), AllowAnonymous]
- //public WebResponseContent Queryinventory([FromBody] GenerateInv generate)
- //{
- // return Service.Queryinventory(generate);
- //}
- [HttpGet, Route("PalletQueryinventory"), AllowAnonymous]
- public WebResponseContent PalletQueryinventory()
- {
- return Service.PalletQueryinventory();
- }
- //[HttpPost, Route("RelocationTaskCompleted"), AllowAnonymous]
- //public WebResponseContent RelocationTaskCompleted([FromBody] GenerateInv2 generate)
- //{
- // return Service.RelocationTaskCompleted(generate);
- //}
-
- //[HttpPost, Route("Rawmaterialout"), AllowAnonymous]
- //public WebResponseContent Rawmaterialout([FromBody]GenerateInv3 generate)
- //{
- // return Service.Rawmaterialout(generate);
- //}
-
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
[HttpGet, Route("Cancelinventory"), AllowAnonymous]
public WebResponseContent Cancelinventory(int taskNum)
{
return Service.Cancelinventory(taskNum);
}
- [HttpPost, Route("InboundTaskCompleted"), AllowAnonymous]
+ /// <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="taskNum"></param>
+ /// <returns></returns>
[HttpPost, Route("OutboundTaskCompleted"), AllowAnonymous]
public WebResponseContent OutboundTaskCompleted(int taskNum)
{
return Service.OutboundTaskCompleted(taskNum);
}
+ /// <summary>
+ /// 鐩樼偣浠诲姟鍥炰紶WMS
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="qty"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InventoryIn"), AllowAnonymous]
+ public WebResponseContent InventoryIn([FromBody] string name, int qty)
+ {
+ return Service.InventoryIn(name, qty);
+ }
+
+ [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);
+ }
+
+ [HttpPost, Route("FeedBackInboundERP"), AllowAnonymous]
+ public WebResponseContent FeedBackInboundERP(string upperOrderNo, string linId)
+ {
+ return Service.FeedBackInboundERP(upperOrderNo, linId);
+ }
+
+ /// <summary>
+ /// 鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟erp
+ /// </summary>
+ /// <param name="orderNO"></param>
+ /// <param name="linId"></param>
+ /// <returns></returns>
+ [HttpPost, Route("FeedBackOutERP"), AllowAnonymous]
+ public WebResponseContent FeedBackOutERP(string orderNO, string linId)
+ {
+ return Service.FeedBackOutERP(orderNO, linId);
+ }
+
+ /// <summary>
+ /// 閫夊畾搴撳瓨鐢熸垚鐩樼偣鍗曞嚭搴�
+ /// </summary>
+ [HttpPost, Route("TakeOutbound"), AllowAnonymous]
+ public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews)
+ {
+ return Service.TakeOutbound(stockViews);
+ }
+
+ /// <summary>
+ /// SMOM涓嬪彂鍑哄簱鍗曟嵁
+ /// </summary>
+ /// <param name="orderAddDTO"></param>
+ /// <returns></returns>
[HttpPost, Route("AddOutboundOrders"), AllowAnonymous]
public WebResponseContent AddOutboundOrders([FromBody] Houseounbound orderAddDTO)
{
return Service.AddOutboundOrders(orderAddDTO);
}
+ /// <summary>
+ /// SMOM鐩樼偣浠诲姟涓婁紶
+ /// </summary>
+ /// <param name="houseInventoryOut"></param>
+ /// <returns></returns>
[HttpPost, Route("InventoryOut"), AllowAnonymous]
public WebResponseContent InventoryOut([FromBody] HouseCancelOut houseInventoryOut)
{
return Service.InventoryOut(houseInventoryOut);
}
- [HttpPost, Route("InventoryIn"), AllowAnonymous]
- public WebResponseContent InventoryIn([FromBody] string name)
- {
- return Service.InventoryIn(name);
- }
-
+ /// <summary>
+ /// SMOM鐩樼偣鍚庡簱瀛樿皟鏁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("SMOMAdjustment"), AllowAnonymous]
+ public WebResponseContent SMOMAdjustment([FromBody] HouseAdjustment houseAdjustment)
+ {
+ return Service.SMOMAdjustment(houseAdjustment);
+ }
}
}
--
Gitblit v1.9.3