From f49fa4b5027cfdc27b429985d023e8002abcca2e Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 05 十一月 2025 23:54:12 +0800
Subject: [PATCH] 1

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index d85ccb2..01b4620 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -101,8 +101,20 @@
                                     bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
                                     if (sendFlag)
                                     {
-                                        commonStackerCrane.LastTaskType = task.TaskType;
-                                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
+                                        WebResponseContent webResponseContent=_taskService.UpdateTaskStatusToNext(task.TaskNum);
+                                        if (webResponseContent.Status)
+                                        {
+                                            wcs_PLCto09("浠诲姟涓嬪彂鎴愬姛", $"浠诲姟鍙凤細{task.TaskNum}", $"鎵樼洏鏉$爜锛歿task.PalletCode},鏃堕棿锛歿DateTime.Now}");
+                                        }
+                                        else
+                                        {
+                                            wcs_PLCto09("浠诲姟涓嬪彂澶辫触", $"浠诲姟鍙凤細{task.TaskNum}", $"澶辫触鍘熷洜锛歿webResponseContent.Message}");
+                                        }
+                                    }
+                                    else
+                                    {
+
+                                        wcs_PLCto09("浠诲姟涓嬪彂澶辫触", $"浠诲姟鍙凤細{task.TaskNum}", $"涓嬪彂缁欏爢鍨涙満浠诲姟澶辫触锛岀姸鎬侊細{sendFlag}");
                                     }
                                 }
                             }
@@ -112,6 +124,7 @@
             }
             catch (Exception ex)
             {
+                wcs_PLCto09("鍫嗗灈鏈篔ob", $"鏁呴殰", $"鍘熷洜锛歿ex.Message}");
                 //Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
             }
             return Task.CompletedTask;
@@ -542,7 +555,7 @@
                     if (deviceProDTO != null)
                     {
                         int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock);        //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鍙栬揣淇″彿
-                        if (B_Event_Test == 1)
+                        if (B_Event_Test == 1 || (task.SourceAddress== "R01-002-043-001-01" && B_Event_Test==6))
                         {
                             if (Releasespermitted2(commonStackerCrane, task.SourceAddress,true))  //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
                             {
@@ -1327,5 +1340,10 @@
         {
             WriteLog.Write_Log("鍑哄簱绔欏彴淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
         }
+
+        public void wcs_PLCto09(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("鍫嗗灈鏈轰笅鍙戞儏鍐�", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
     }
 }

--
Gitblit v1.9.3