From dab0a583302f306d8c0ec37fbae37c9b4e37e473 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 十二月 2025 18:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 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..026bc56 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -31,9 +31,21 @@
}
[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);
}
/// <summary>
/// WCS鐢宠鍏ュ簱浠诲姟
@@ -52,10 +64,22 @@
/// <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);
}
+
+ /// <summary>
+ /// 鐢宠宸烽亾
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ApplyLocation"), AllowAnonymous]
+ public WebResponseContent ApplyLocation(string palletCode)
+ {
+ return Service.ApplyLocation(palletCode);
+ }
+
/// <summary>
/// 鍒ゆ柇宸烽亾鍐呯Щ搴�
/// </summary>
@@ -169,5 +193,32 @@
{
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);
+ }
}
}
--
Gitblit v1.9.3