From c228a2254ec6a31fe32533e2b6323b5e48dfaf06 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 11 一月 2025 17:02:19 +0800
Subject: [PATCH] 日志

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 9afc6ee..501c327 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -39,6 +39,8 @@
         private readonly IDt_StationManagerRepository _stationManagerRepository;
         private readonly ITask_HtyRepository _htyRepository;
         private readonly ISys_ConfigService _sys_ConfigService;
+        private static List<string>? userTokenIds;
+        private static List<int>? userIds;
 
         public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IProcessRepository processRepository, ICacheService cacheService, INoticeService noticeService, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository htyRepository, ISys_ConfigService sys_ConfigService)
         {
@@ -58,15 +60,10 @@
         {
             try
             {
-                // speStackerCrane.GetStackerCraneStatus<StackerCraneAutoStatus>();
-                // speStackerCrane.GetStackerCraneStatus<StackerCraneWorkStatus>();
-                // speStackerCrane.GetStackerCraneStatus<StackerCraneStatus>();
 
                 CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
                 if (commonStackerCrane != null)
                 {
-                    //EqptAlive(commonStackerCrane);
-                    //Console.Out.WriteLine(commonStackerCrane.DeviceName);
                     if (!commonStackerCrane.IsEventSubscribed)
                     {
                         commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//璁㈤槄浠诲姟瀹屾垚浜嬩欢
@@ -161,8 +158,9 @@
             {
                 if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
                 {
-                    //Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
-                    ConsoleHelper.WriteColorLine($"銆恵commonStackerCrane.DeviceName}銆戜换鍔″畬鎴�,浠诲姟鍙凤細銆恵e.TaskNum}銆�", ConsoleColor.Blue);
+                    string str = $"銆恵commonStackerCrane.DeviceName}銆戜换鍔″畬鎴�,浠诲姟鍙凤細銆恵e.TaskNum}銆�";
+                    WriteInfo(commonStackerCrane.DeviceName, str);
+                    ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
                     var task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
 
                     if (task == null) commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
@@ -189,7 +187,7 @@
                             return;
                     }
 
-                    _taskService.StackCraneTaskCompleted(e.TaskNum);
+                    var content = _taskService.StackCraneTaskCompleted(e.TaskNum);
                     if (commonStackerCrane.DeviceCode.Contains("CH") && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                     {
                         task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
@@ -201,7 +199,10 @@
                         _taskRepository.DeleteData(task);
                         _htyRepository.AddData(TASKHTY);
                     }
-                    commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+                    var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+                    str = $"WMS|WCS浠诲姟瀹屾垚锛氥�恵content.Status}銆�,鍫嗗灈鏈哄畬鎴愪俊鍙峰啓鍏ワ細銆恵isWorkType}銆�,浠诲姟鍙凤細銆恵e.TaskNum}銆�,鎵樼洏鍙凤細銆恵task.PalletCode}銆�";
+                    WriteInfo(commonStackerCrane.DeviceName, str);
+                    ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
                 }
             }
         }
@@ -242,7 +243,13 @@
                 if (occupiedStation == null)
                 {
                     // 濡傛灉褰撳墠鍑哄簱浠诲姟绔欏彴涓嶅厑璁告斁璐э紝鎺掗櫎褰撳墠浠诲姟锛屾煡鎵惧叾浠栧嚭搴撲换鍔�
-                    ConsoleHelper.WriteErrorLine($"浠诲姟鍙凤細銆恵task.TaskNum}銆戝嚭搴撳湴鍧�锛氥�恵task.NextAddress}銆戜笉鍏佽鏀捐揣");
+
+                    var log = $"浠诲姟鍙凤細銆恵task.TaskNum}銆戝嚭搴撳湴鍧�锛氥�恵task.NextAddress}銆戜笉鍏佽鏀捐揣";
+                    ConsoleHelper.WriteErrorLine(log);
+
+                    _noticeService.Logs(userTokenIds, new { commonStackerCrane.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+                    WriteInfo(commonStackerCrane.DeviceName, log);
+
                     task = FindAnotherOutboundTask(commonStackerCrane.DeviceCode, task.TaskId);
                 }
                 else
@@ -369,7 +376,11 @@
                 {
                     return candidateTask;
                 }
-                ConsoleHelper.WriteErrorLine($"浠诲姟鍙凤細銆恵candidateTask.TaskNum}銆戝嚭搴撳湴鍧�锛氥�恵candidateTask.NextAddress}銆戜笉鍏佽鏀捐揣");
+                var log = $"浠诲姟鍙凤細銆恵candidateTask.TaskNum}銆戝嚭搴撳湴鍧�锛氥�恵candidateTask.NextAddress}銆戜笉鍏佽鏀捐揣";
+                ConsoleHelper.WriteErrorLine(log);
+
+                _noticeService.Logs(userTokenIds, new { deviceCode, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+                WriteInfo(deviceCode, log);
             }
 
             return null;

--
Gitblit v1.9.3