From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +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 | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 21ebc59..7ec2844 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"
@@ -4,6 +4,7 @@
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -190,7 +191,6 @@
/// <summary>
/// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
/// </summary>
- /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
/// <param name="StationCode">绔欏彴鍦板潃</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous]
@@ -228,6 +228,15 @@
{
return await Service.OutProductTask(keys, StationCode, Grade);
}
+
+ /// <summary>
+ /// 鐢熸垚鎴愬搧鎶ュ簾浠诲姟
+ /// </summary>
+ [HttpPost, HttpGet, Route("OutProScrapTask"), AllowAnonymous]
+ public async Task<WebResponseContent> OutProScrapTask([FromBody] int[] keys, string StationCode, int Grade)
+ {
+ return await Service.OutProScrapTask(keys, StationCode, Grade);
+ }
///// <summary>
///// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
///// </summary>
@@ -259,6 +268,16 @@
public WebResponseContent IsRelocation(int taskNum, string locationCode)
{
return Service.IsRelocation(taskNum, locationCode);
+ }
+
+ /// <summary>
+ /// 鎵嬪姩绉诲簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ManualRelocation"), AllowAnonymous]
+ public WebResponseContent ManualRelocation([FromBody] RelocationDTO relocationDTO)
+ {
+ return Service.ManualRelocation(relocationDTO);
}
/// <summary>
@@ -400,5 +419,15 @@
{
return Service.TakeOutbound(stockViews);
}
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TaskHandCancel"), AllowAnonymous]
+ public async Task<WebResponseContent> TaskHandCancel(int taskNum)
+ {
+ return await Service.TaskHandCancel(taskNum);
+ }
}
}
--
Gitblit v1.9.3