From 507c540eed466aaabfc543c8a514596445d3a7af Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 10 四月 2026 14:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 6fe4558..d8009d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -75,14 +75,14 @@
/// </summary>
/// <param name="wMSCancelTask">鍙栨秷浠诲姟瀹炰綋绫�</param>
/// <returns></returns>
- WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask);
+ WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask);
/// <summary>
/// 淇敼浠诲姟浼樺厛绾�
/// </summary>
/// <param name="updateTaskPriority"></param>
/// <returns></returns>
- WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority);
+ WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority);
/// <summary>
/// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟
@@ -210,7 +210,7 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent TaskStatusRecovery(int taskNum);
- WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del);
+ WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del = false, string ErrorCode = "");
/// <summary>
/// 鍥炴粴浠诲姟鐘舵��
/// </summary>
@@ -233,7 +233,7 @@
/// <param name="deviceTypeEnum"></param>
/// <param name="locationStatusEnum"></param>
/// <returns></returns>
- WebResponseContent UpdateLocationStatus(string locationCode,string palletCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum);
+ WebResponseContent UpdateLocationStatus(string locationCode, string palletCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum);
WebResponseContent ModifyWMSLayoutZone(WMSUpdateLocationArea wMSUpdateLocationArea);
@@ -268,7 +268,7 @@
/// <param name="taskCode">浠诲姟鍙�</param>
/// <param name="containerCode">瀹瑰櫒缂栫爜</param>
/// <returns></returns>
- public WebResponseContent MaterialBoxInspection(string taskCode ,string containerCode);
+ public WebResponseContent MaterialBoxInspection(string taskCode, string containerCode);
/// <summary>
/// 4F鎻愬崌鏈哄嚭鍙ｆ墭鐩樺彿涓婃姤WMS
@@ -311,7 +311,7 @@
/// </summary>
/// <param name="TaskCode">浠诲姟鍙�</param>
/// <returns></returns>
- WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address=null);
-
+ WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address = null);
+
}
}
--
Gitblit v1.9.3