From fdc247b8a0dfabe97c8d0fe1e0bee0b4c06c6915 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期五, 07 三月 2025 21:20:21 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 8ae095c..ac732f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -29,6 +29,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Model.Models.System;
namespace WIDESEAWCS_ITaskInfoService
{
@@ -84,6 +85,26 @@
/// <param name="nextAddress">涓嬩竴鍦板潃</param>
/// <returns></returns>
Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress);
+
+ /// <summary>
+ /// 鏍规嵁浠诲姟鍙锋煡璇换鍔�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryTakNnmTask(int taskNum);
+
+ /// <summary>
+ /// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task);
+
+ /// <summary>
+ /// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗嚭搴撳彇璐ф墽琛屼腑淇敼涓哄嚭搴撳彇璐у畬鎴�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent UpdateTaskStatusToLine_Outgrab(Dt_Task task);
/// <summary>
/// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎瀹屾垚鐨勪换鍔�
@@ -173,7 +194,7 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- WebResponseContent StackCraneTaskCompleted(int taskNum);
+ WebResponseContent StackCraneTaskCompleted(int taskNum,float weight);
/// <summary>
/// 鎭㈠鎸傝捣浠诲姟
@@ -188,5 +209,6 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent RollbackTaskStatusToLast(int taskNum);
+ Dt_Task QueryTaskState();
}
}
--
Gitblit v1.9.3