From a5fec958ef86371826ed4eb947ea0ebd476cd0ed Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 04 七月 2025 15:10:37 +0800
Subject: [PATCH] 修复方法声明并重构命令发送逻辑在 ITaskService.cs中QueryExecutingConveyorLineTask方法的声明末尾添加了分号。注释掉了多处 conveyorLine.SendCommand的调用，并替换为 SendCommand方法，确保在发送命令时设置了必要的值。 在 RequestInbound.cs中，进行了类似的重构，更新了任务状态。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 7930101..f7ba7c6 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -316,6 +316,17 @@
}
/// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryExecutingConveyorLineTask(string nextAddress, string Barcode)
+ {
+ return BaseDal.QueryFirst(x => (x.NextAddress == nextAddress||x.TargetAddress==nextAddress) && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
+ }
+
+ /// <summary>
/// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎瀹屾垚鐨勪换鍔�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
@@ -571,9 +582,15 @@
// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
+
+ QuartzLogger.WriteLogToFile($"Info_鑾峰彇璐т綅", $"鑾峰彇璐т綅,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙凤細銆恵task.PalletCode}銆戣繑鍥炲弬鏁般�恵JsonConvert.SerializeObject(content)}銆憑Environment.NewLine}{Environment.NewLine}");
+
+
// 妫�鏌ョ姸鎬佸苟杩斿洖
if (!content.Status)
+ {
return content;
+ }
// 鍙嶅簭鍒楀寲浠诲姟鏁版嵁
var taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
@@ -918,7 +935,13 @@
}
return wcsBasez + address;
}
-
+ public WebResponseContent Delete(Dt_Task task)
+ {
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+ _taskHtyRepository.AddData(taskHty);
+ return base.DeleteData(task);
+ }
#region 閲嶅啓鏂规硶
public override WebResponseContent DeleteData(object[] key)
--
Gitblit v1.9.3