From 48091350d466941e7d1a6a9c803ad4205d8c3d86 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期二, 07 一月 2025 09:16:33 +0800
Subject: [PATCH] 最新修改

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index c8c7638..bb8de63 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -44,7 +44,7 @@
         {
             CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
             try
-            {               
+            {
                 //CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
                 if (commonStackerCrane != null)
                 {
@@ -59,14 +59,17 @@
 
                         if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
                         {
+                            WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈哄紑濮嬫墽琛岋紝鑾峰彇浠诲姟鍙�");
                             Dt_Task? task = GetTask(commonStackerCrane);
                             if (task != null)
                             {
+                                WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈哄紑濮嬫墽琛岋紝浠诲姟鍙凤細{task.TaskNum}");
                                 StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                                 int isIn = commonStackerCrane.Communicator.Read<byte>("DB106.12.0");
                                 if((task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) &&isIn==1)//濡傛灉鍦ㄥ叆搴撲腑锛屼笉鍏佽涓嬪彂鍑哄簱浠诲姟
                                 {
-                                  return Task.CompletedTask;
+                                    WriteDebug(nameof(CommonStackerCraneJob), $"鍑哄簱鏍¢獙锛屽湪鍏ュ簱涓紝涓嶅厑璁′笅鍙戝嚭搴撶被鍨嬩换鍔★紝浠诲姟鍙凤細{task.TaskNum}");
+                                    return Task.CompletedTask;
                                 }
                                 if (stackerCraneTaskCommand != null)
                                 {
@@ -77,13 +80,30 @@
                                         {
                                             _taskService.UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InExecuting);
                                             _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撴墽琛屼腑");
+                                            WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽紑濮嬪洖鍐橶MS浠诲姟鐘舵�侊紝浠诲姟鍙凤細{task.TaskNum}");
                                             var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
+                                            if(response.Status==true)
+                                            {
+                                                WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佹垚鍔燂紝浠诲姟鍙凤細{task.TaskNum}");
+                                            }
+                                            else
+                                            {
+                                                WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佸け璐ワ紝浠诲姟鍙凤細{task.TaskNum}锛屽け璐ュ師鍥爗response.Message}");
+                                            }
                                         }
                                         else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                                         {
                                             _taskService.UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutExecuting);
                                             _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撴墽琛屼腑");
                                             var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
+                                            if (response.Status == true)
+                                            {
+                                                WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佹垚鍔燂紝浠诲姟鍙凤細{task.TaskNum}");
+                                            }
+                                            else
+                                            {
+                                                WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佸け璐ワ紝浠诲姟鍙凤細{task.TaskNum}锛屽け璐ュ師鍥爗response.Message}");
+                                            }
                                         }
                                     }
                                 }
@@ -94,7 +114,7 @@
             }
             catch (Exception ex)
             {
-                Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
+                WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈烘墽琛屽紓甯革紝{ex.Message}");     
             }
 
             if (commonStackerCrane != null)
@@ -108,6 +128,7 @@
                     if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
                     {
                         _taskService.StackCraneTaskCompleted(tasknum);
+                        WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈篧CS浠诲姟鎵ц瀹屾垚锛屼换鍔″彿锛歿tasknum}");
                         Console.Out.WriteLine("TaskCompleted" + tasknum);
                         bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
                         if (issuccess)

--
Gitblit v1.9.3