From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +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 | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 2c768e0..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>
@@ -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>
@@ -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