From 48e2278d7ac330c7f05deda6f884acb6f01206b4 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 13 四月 2026 17:13:51 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 143 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 24 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 3d429ed..d8cbdd3 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -31,10 +31,39 @@
}
[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("WMSGenerateOutboundTask"), AllowAnonymous]
+ public WebResponseContent WMSGenerateOutboundTask([FromBody] int[] keys)
+ {
+ 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>
@@ -52,10 +81,28 @@
/// <param name="palletCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
- public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
+ public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode, int heightType)
{
- return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
+ 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>
@@ -96,26 +143,6 @@
public WebResponseContent OutboundTaskCompleted(int taskNum)
{
return Service.OutboundTaskCompleted(taskNum);
- }
- /// <summary>
- /// WMS涓嬪彂鍑哄簱鍗曟嵁
- /// </summary>
- /// <param name="orderAddDTO"></param>
- /// <returns></returns>
- [HttpPost, Route("AddOutboundOrders"), AllowAnonymous]
- public WebResponseContent AddOutboundOrders([FromBody] Houseounbound orderAddDTO)
- {
- return Service.AddOutboundOrders(orderAddDTO);
- }
- /// <summary>
- /// 鐩樼偣浠诲姟涓婁紶
- /// </summary>
- /// <param name="houseInventoryOut"></param>
- /// <returns></returns>
- [HttpPost, Route("InventoryOut"), AllowAnonymous]
- public WebResponseContent InventoryOut([FromBody] HouseCancelOut houseInventoryOut)
- {
- return Service.InventoryOut(houseInventoryOut);
}
/// <summary>
/// 鐩樼偣浠诲姟鍥炰紶WMS
@@ -169,5 +196,73 @@
{
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);
+ }
+
+ /// <summary>
+ /// SMOM鐩樼偣鍚庡簱瀛樿皟鏁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("SMOMAdjustment"), AllowAnonymous]
+ public WebResponseContent SMOMAdjustment([FromBody] HouseAdjustment houseAdjustment)
+ {
+ return Service.SMOMAdjustment(houseAdjustment);
+ }
+
+ /// <summary>
+ /// SMOM鍙戣揣鍚庢垚鍝佺搴撳瓨璋冩暣
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("SMOMStock"), AllowAnonymous]
+ public WebResponseContent SMOMStock([FromBody] HouseStockDetail houseStockDetail)
+ {
+ return Service.SMOMStock(houseStockDetail);
+ }
}
}
--
Gitblit v1.9.3