From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 13:52:51 +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 | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 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 a42aa83..fec41b3 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"
@@ -34,18 +34,43 @@
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟
/// </summary>
- /// <param name="palletCode"></param>
- /// <param name="stationCode"></param>
+ /// <param name="saveModel"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
{
return Service.RequestInboundTask(saveModel);
}
- //public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
- //{
- // return Service.RequestInboundTask(palletCode, stationCode);
- //}
+
+ /// <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)
+ {
+ return Service.OutEmpty(qty, address, WarehouseId);
+ }
+
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ {
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
+ }
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
@@ -77,7 +102,7 @@
/// <param name="stockSelectViews"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews)
+ public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
{
return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
}
@@ -138,5 +163,15 @@
{
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);
+ }
}
}
--
Gitblit v1.9.3