From 225d11e2ddaa55d1d482201cb4d89c9486cdba69 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 20 六月 2025 12:27:52 +0800
Subject: [PATCH] 更新代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 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 f84c7dc..21ebc59 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"
@@ -42,7 +42,14 @@
{
return Service.RequestInboundTask(saveModel);
}
-
+ /// <summary>
+ /// 鏌ヨ璐ㄦ鏁伴噺
+ /// </summary>
+ [HttpPost, HttpGet, Route("InQualityConfirm"), AllowAnonymous]
+ public WebResponseContent InQualityConfirm(string palletCode)
+ {
+ return Service.InQualityConfirm(palletCode);
+ }
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -75,9 +82,9 @@
/// <param name="palletCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
- public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "")
{
- return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode, materielBoxCode);
}
/// <summary>
@@ -130,7 +137,11 @@
{
return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType);
}
-
+ [HttpPost, HttpGet, Route("RequestZHInboundTask"), AllowAnonymous]
+ public WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot)
+ {
+ return Service.RequestZHInboundTask(agvTaskCode,palletCode,palletType,materialLot);
+ }
/// <summary>
/// 鍏ュ簱浠诲姟瀹屾垚
/// </summary>
@@ -183,9 +194,9 @@
/// <param name="StationCode">绔欏彴鍦板潃</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous]
- public async Task<WebResponseContent> OutProductTask([FromBody] int[] keys, string StationCode)
+ public async Task<WebResponseContent> OutProductTask([FromBody] int[] keys, string StationCode, int Grade)
{
- return await Service.OutProductTask(keys, StationCode);
+ return await Service.OutProductTask(keys, StationCode, Grade);
}
/// <summary>
/// 鎴愬搧浣欐枡閫�搴撳叆浠�
@@ -213,9 +224,9 @@
/// 鐢熸垚鎴愬搧鎻愬簱浠诲姟
/// </summary>
[HttpPost, HttpGet, Route("OutProRworkTask"), AllowAnonymous]
- public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode)
+ public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode, int Grade)
{
- return await Service.OutProductTask(keys, StationCode);
+ return await Service.OutProductTask(keys, StationCode, Grade);
}
///// <summary>
///// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
@@ -260,7 +271,6 @@
{
return await Service.TaskCompleted(taskNum);
}
-
/// <summary>
/// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
/// </summary>
@@ -268,9 +278,9 @@
/// <param name="agvDescription"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
- public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
+ public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "")
{
- return Service.PushTasksToWCSSingle(taskNum, agvDescription);
+ return Service.PushTasksToWCSSingle(taskNum, agvDescription, agvtaskNum);
}
/// <summary>
/// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
@@ -374,5 +384,21 @@
{
return Service.OutProductSelect(orderDetailId, proStockViews);
}
+ /// <summary>
+ /// 闃荤剨鎵规鐗╂枡鏌ヨ
+ /// </summary>
+ [HttpPost, Route("GetZHMesMaterialLot"), AllowAnonymous]
+ public WebResponseContent GetZHMesMaterialLot(string materialLot)
+ {
+ return Service.GetZHMesMaterialLot(materialLot);
+ }
+ /// <summary>
+ /// 閫夊畾搴撳瓨鐢熸垚鐩樼偣鍗曞嚭搴�
+ /// </summary>
+ [HttpPost, Route("TakeOutbound"), AllowAnonymous]
+ public WebResponseContent TakeOutbound([FromBody] List<StockViewDTO> stockViews)
+ {
+ return Service.TakeOutbound(stockViews);
+ }
}
}
--
Gitblit v1.9.3