From b7f53ba61fbc1844d7b92ff852762b140d46ab54 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 23 六月 2025 19:58:16 +0800
Subject: [PATCH] 最新

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |  413 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 296 insertions(+), 117 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 4438c4e..d85ccb2 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"
@@ -53,14 +53,42 @@
                 {
                     Signalinteraction(commonStackerCrane);  //鍑哄簱淇″彿浜や簰
                     Siganlinteraction2(commonStackerCrane); //鍏ュ簱淇″彿浜や簰
-                    if (!commonStackerCrane.IsEventSubscribed)
+                    /*if (!commonStackerCrane.IsEventSubscribed)
                     {
                         commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//璁㈤槄浠诲姟瀹屾垚浜嬩欢
+                    }*/
+                    if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted)
+                    {
+                        wcs_PLCto07("浠诲姟瀹屾垚", $"浠诲姟鍙凤細{commonStackerCrane.CurrentTaskNum}", $"璇诲彇鍒板爢鍨涙満瀹屾垚淇″彿锛屼换鍔″畬鎴愶紝瀹屾垚鏃堕棿锛歿DateTime.Now}");
+                        //Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
+                        WebResponseContent webResponse=_taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
+                        if (webResponse.Status)
+                        {
+                            
+                            bool ddjfk= commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+                            wcs_PLCto07("浠诲姟瀹屾垚", $"浠诲姟鍙凤細{commonStackerCrane.CurrentTaskNum}锛屼慨鏀逛换鍔℃垚鍔�", $"淇敼浠诲姟瀹屾垚锛屽苟鍙嶉鍫嗗灈瀹屾垚淇″彿鏄惁鎴愬姛锛歿ddjfk}");
+                        }
+                        else
+                        {
+                            WebResponseContent webRespon = _taskService.StackCraneTashty(commonStackerCrane.CurrentTaskNum);
+                            if (webRespon.Status)
+                            {
+
+                                bool fk = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+                                wcs_PLCto07("浠诲姟瀹屾垚", $"浠诲姟鍙凤細{commonStackerCrane.CurrentTaskNum},鍘嗗彶鏌ヨ淇℃伅", $"浠诲姟鏌ユ壘浠诲姟閲嶏紝骞惰繘琛屽弽棣堬細{fk}");
+                            }
+                            else
+                            {
+                                wcs_PLCto07("浠诲姟瀹屾垚鏁呴殰", $"浠诲姟鍙凤細{commonStackerCrane.CurrentTaskNum}锛屽巻鍙蹭换鍔℃煡璇㈡暟鎹�", $"澶辫触鍘熷洜锛歿webResponse.Message}");
+                            }
+
+                        }
                     }
+
 
                     if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
                     {
-                        commonStackerCrane.CheckStackerCraneTaskCompleted();//闃叉浠诲姟瀹屾垚浜嬩欢鐩戞祴瓒呮椂锛屽啀鎵嬪姩瑙﹀彂涓�娆�
+                        //commonStackerCrane.CheckStackerCraneTaskCompleted();//闃叉浠诲姟瀹屾垚浜嬩欢鐩戞祴瓒呮椂锛屽啀鎵嬪姩瑙﹀彂涓�娆�
 
                         if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
                         {
@@ -99,9 +127,10 @@
             CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane;
             if (commonStackerCrane != null)
             {
-                if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
+                if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5 && e.TaskNum !=0)
                 {
-                    Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
+                    wcs_PLCto07("浠诲姟瀹屾垚", $"浠诲姟鍙凤細{e.TaskNum}", $"璇诲彇鍒板爢鍨涙満瀹屾垚淇″彿锛屼换鍔″畬鎴愶紝瀹屾垚鏃堕棿锛歿DateTime.Now}");
+                    //Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
                     _taskService.StackCraneTaskCompleted(e.TaskNum);
                     commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
                 }
@@ -115,61 +144,113 @@
         /// <returns></returns>
         private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
         {
-            Dt_Task task;
-            /*if (commonStackerCrane.LastTaskType == null)
+            try
             {
-                task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
-            }
-            else
-            {
-                if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
-                {
-                    task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
-                    if (task == null)
-                    {
-                        task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
-                    }
-                }
-                else
-                {
-                    task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
-                }
-            }*/
-            task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
+                //  
+                if (_taskService.CutStackerCraneTask(commonStackerCrane.DeviceCode) != null) return null;
+                //鏌ヨ鍏ㄩ儴浠诲姟锛屾寜鏃堕棿鎺掑簭杩涜鏌ヨ
+                List<Dt_Task> TasksList = _taskService.CraneTaskList(commonStackerCrane.DeviceCode);
+                if (TasksList.Count == 0) return null;
 
-            if (task != null && task.TaskType== (int)TaskOutboundTypeEnum.Outbound)
-            {
-                string[] targetCodes = task.SourceAddress.Split("-");
-                if (targetCodes[4] == "02")
+                Dt_Task RELNew= TasksList.Where(x=>x.TaskType== (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskOutStatusEnum.ResRestNet).OrderBy(x => x.CreateDate).FirstOrDefault();
+                if( RELNew != null )
                 {
 
-                    task = OutTaskMovelibrary(task);
-                    if (task != null)
+                    string[] targetCodes = RELNew.TargetAddress.Split("-");
+
+                    //濡傛灉涓烘繁搴撲綅锛屽垯鏌ョ湅鏄惁鏈夐渶瑕佹墽琛岀殑浠诲姟
+                    if (targetCodes[4] == "02")
                     {
-                        return task;
-                    }
-                }
-                if (OutTaskStationIsOccupied(task) != null)
-                {
-                    return task;
-                }
-                else
-                {
-                    List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
-                    List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
-                    foreach (var item in tasks)
-                    {
-                        if (OutTaskStationIsOccupied(task) != null)
+
+                        Dt_Task taskstrot = InTaskMove(RELNew);
+                        if (taskstrot != null)
                         {
-                            return task;
+                            return taskstrot;
                         }
                     }
-                    //task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+                    else
+                    {
+                            return RELNew;
+                    }
                 }
-            }
 
-            return task;
+
+                foreach (var item in TasksList)
+                {
+                    if (item.TaskType == (int)TaskInboundTypeEnum.Inbound)
+                    {
+                        string[] targetCodes = item.TargetAddress.Split("-");
+                        if (targetCodes[4] == "01") return item;        //濡傛灉鏄祬搴撲綅锛屽垯鐩存帴杩斿洖璇ヤ换鍔�
+
+                        //濡傛灉涓烘繁搴撲綅锛屽垯鏌ョ湅鏄惁鏈夐渶瑕佹墽琛岀殑浠诲姟
+                        if (targetCodes[4] == "02")
+                        {
+
+                            Dt_Task taskst = InTaskMove(item);
+                            if (taskst != null)
+                            {
+                                return taskst;
+                            }
+                        }
+                    }
+                    else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                    {
+                        string[] targetCodes = item.SourceAddress.Split("-");//杩涜瑙f瀽璐т綅
+                        if (targetCodes[4] == "02")
+                        {
+                            //涓烘繁搴撲綅
+                            Dt_Task taskst = OutTaskMovelibrary(item);  //鍒ゆ柇鏄惁闇�瑕佽繘琛岀Щ搴�
+                            if (taskst != null)
+                            {
+                                if (taskst.TaskType == (int)TaskRelocationTypeEnum.Relocation)
+                                {
+                                    return taskst;
+                                }
+                                else
+                                {
+                                    if (taskst.TargetAddress == "R02-001-021-001-02" || taskst.TargetAddress == "R02-001-022-001-02")
+                                    {
+                                        return taskst;
+                                    }
+                                    else
+                                    {
+                                        if (OutTaskStationIsOccupied(taskst) != null)       //鍒ゆ柇鍑哄簱绔欏彴鏄惁鍙笅鍙�
+                                        {
+                                            return taskst;
+                                        }
+                                    }
+
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (item.TargetAddress == "R02-001-021-001-02" || item.TargetAddress == "R02-001-022-001-02")
+                            {
+                                return item;
+                            }
+                            else
+                            {
+                                if (OutTaskStationIsOccupied(item) != null)       //鍒ゆ柇鍑哄簱绔欏彴鏄惁鍙笅鍙�
+                                {
+                                    return item;
+                                }
+                            }
+                            
+                        }
+                    }
+                }
+
+                return null;
+            }
+            catch (Exception ex)
+            {
+                WriteLog.Write_Log("鍫嗗灈鏈轰换鍔′笅鍙戞晠闅�", "鏁呴殰", "鏁呴殰", new { 淇℃伅 = ex.Message });
+                return null;
+            } 
         }
+
+       
 
         /// <summary>
         /// 鍑哄簱浠诲姟鍒ゆ柇鍑哄簱绔欏彴鏄惁琚崰鐢�
@@ -190,6 +271,10 @@
                     {
                         return task;
                     }
+                    else
+                    {
+                        wcs_PLCto08("鍑哄簱浠诲姟", $"浠诲姟鍙凤細{task.TaskNum}锛岃繘琛屽嚭搴�", $"璇诲彇鍒拌緭閫佺嚎涓嶅彲鏀捐揣淇″彿锛屼笉鍙繘琛屼换鍔′笅鍙�");
+                    }
                 }
             }
             else
@@ -199,6 +284,7 @@
             return null;
         }
 
+        
         /// <summary>
         /// 鍑哄簱浠诲姟鍒ゆ柇鏄惁闇�瑕佽繘琛岀Щ搴揗ove the library
         /// </summary>
@@ -206,49 +292,69 @@
         /// <returns>濡傛灉鏈鍗犵敤锛岃繑鍥炰紶鍏ョ殑浠诲姟淇℃伅锛屽惁鍒欙紝杩斿洖null</returns>
         private Dt_Task? OutTaskMovelibrary([NotNull] Dt_Task task)
         {
-            try
+            string[] targetCodes = task.SourceAddress.Split("-");
+            if (targetCodes[1] == "001")
             {
-                string[] targetCodes = task.SourceAddress.Split("-");
-                if (targetCodes[1] == "001")
-                {
-                    targetCodes[1] = "002";
+                targetCodes[1] = "002";
 
-                }
-                else if (targetCodes[1] == "004")
-                {
-                    targetCodes[1] = "003";
-                }
-                targetCodes[4] = "01";
-                string SourceAddress = string.Join("-", targetCodes); //缁勮娴呭簱浣嶅湴鍧�
-                Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault();
-                if (tasks != null)
-                {
-                    return task;
-                }
-                else
-                {
-                    //鍚憌ms鐢宠鍒ゆ柇娴呭簱浣嶆槸鍚︽湁璐э紝鏄惁闇�瑕佽繘琛岀Щ搴�
-                    Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary(task);
-                    if (taskst != null)
-                    {
-                        return taskst;
-                    }
-                }
             }
-            catch (Exception ex)
+            else if (targetCodes[1] == "004")
             {
-
-                throw;
+                targetCodes[1] = "003";
+            }
+            targetCodes[4] = "01";
+            string SourceAddress = string.Join("-", targetCodes); //缁勮娴呭簱浣嶅湴鍧�
+            Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault(); //鎵炬祬搴撲綅鏄惁鏈変换鍔�
+            if (tasks != null)
+            {
+                return tasks;
+            }
+            else
+            {
+                //鍚憌ms鐢宠鍒ゆ柇娴呭簱浣嶆槸鍚︽湁璐э紝鏄惁闇�瑕佽繘琛岀Щ搴�
+                Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary(task);
+                if (taskst != null)
+                {
+                    return taskst;
+                }
             }
             return null;
         }
+
+        private Dt_Task? InTaskMove([NotNull] Dt_Task task)
+        {
+            string[] targetCodes = task.TargetAddress.Split("-");
+            if (targetCodes[1] == "001")
+            {
+                targetCodes[1] = "002";
+
+            }
+            else if (targetCodes[1] == "004")
+            {
+                targetCodes[1] = "003";
+            }
+            targetCodes[4] = "01";
+            string TargetAddress = string.Join("-", targetCodes);  //鐢ㄦ繁搴撲綅缁勮娴呭簱浣嶇紪鍙�
+            Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks2(task.Roadway, TargetAddress).FirstOrDefault(); //鎵炬祬搴撲綅鏄惁鏈夊嚭搴撲换鍔℃垨绉诲簱浠诲姟
+            if(tasks != null) { return tasks; }     //濡傛灉鏈夛紝鍒欏厛涓嬪彂鑷冲爢鍨涙満
+
+            //鍚憌ms鐢宠鍒ゆ柇娴呭簱浣嶆槸鍚︽湁璐э紝鏄惁闇�瑕佽繘琛岀Щ搴�
+            Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary2(task);
+            if (taskst != null)
+            {
+                return taskst;
+            }
+            return null;    
+        }
+
+       
 
         public void Signalinteraction(CommonStackerCrane commonStackerCrane)
         {
             if (Applyrelease(commonStackerCrane)) //璇诲彇鍫嗗灈鏈烘斁璐х敵璇�
             {
                 Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
-                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && (task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
                 {
                     IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Exists(x => x.DeviceChildCode == task.TargetAddress));
                     if (device != null)
@@ -263,22 +369,24 @@
 
                                 if (Releasespermitted(commonStackerCrane, task.TargetAddress,true))  //鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊
                                 {
-                                    WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+                                    wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙锋垚鍔燂細true");
                                 }
                                 else
                                 {
-                                    WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿澶辫触", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+                                    wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙峰け璐�");
                                 }
                             }
                             else
                             {
                                 if (Releasespermitted(commonStackerCrane, task.TargetAddress,false))  //鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇�
                                 {
-                                    WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙锋垚鍔燂細false", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+                                    wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇″彿鎴愬姛锛歠alse");
                                 }
                                 else
                                 {
-                                    WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+                                    wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇″彿澶辫触");
                                 }
                             }
                         }
@@ -288,7 +396,7 @@
             else
             {
                 Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
-                if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+                if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&(task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
                 {
                     if (Completesignal(commonStackerCrane, task.TargetAddress))        //璇诲彇鍒版斁璐у畬鎴愪俊鍙�
                     {
@@ -301,11 +409,12 @@
                                 byte PLCtost = (byte)task.PLCTo;
                                 if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost))
                                 {
-                                    WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戞垚鍔燂紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙e幓鍚�");
+
+                                    wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍘诲悜鎴愬姛锛屽幓鍚戜负锛歿PLCtost}");
                                 }
                                 else
                                 {
-                                    WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戝け璐ワ紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙e幓鍚�");
+                                    wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍘诲悜澶辫触锛屽幓鍚戜负锛歿PLCtost}");
                                 }
                             }
 
@@ -331,36 +440,35 @@
                                                     byte PLCtost2 = 0;
                                                     if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost2))
                                                     {
-                                                        WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戞垚鍔�", $"鍑烘枡鍙e幓鍚�");
-
+                                                        wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"娓呴櫎鍘诲悜鎴愬姛");
                                                     }
                                                     else
                                                     {
-                                                        WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戝け璐�", $"鍑烘枡鍙e幓鍚�");
+                                                        wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"娓呴櫎鍘诲悜澶辫触");
                                                     }
                                                     // 娓呴櫎杈撻�佺嚎
                                                     if (PLCSignal(conveyorLine, task.TargetAddress, (byte)0))
                                                     {
-                                                        WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"鍑烘枡鍙e幓鍚�");
+                                                        wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�");
                                                     }
                                                     else
                                                     {
-                                                        WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"鍑烘枡鍙e幓鍚�");
+                                                        wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
                                                     }
                                                     //鍫嗗灈鏈哄啓瀹屾垚
                                                     if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
                                                     {
-                                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"鍑烘枡鍙e幓鍚�");
+                                                        wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔燂細true");
                                                     }
                                                     else
                                                     {
-                                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"鍑烘枡鍙e幓鍚�");
+                                                        wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�:true");
                                                     }
 
                                                 }
                                                 else
                                                 {
-                                                    WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬幓鍚戞瘮瀵逛笉涓�鑷达紝杈撻�佺嚎鍘诲悜涓猴細{PLCwcstost}锛寃cs鍐欏叆鍘诲悜涓猴細{task.PLCTo}", $"鍑烘枡鍙e幓鍚�");
+                                                    wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍘诲悜姣斿涓嶄竴鑷达紝杈撻�佺嚎鍘诲悜涓猴細{PLCwcstost}锛寃cs鍐欏叆鍘诲悜涓猴細{task.PLCTo}");
                                                 }
                                             }
                                         }
@@ -370,21 +478,23 @@
                                             // 娓呴櫎杈撻�佺嚎
                                             if (PLCSignal(conveyorLine, task.TargetAddress, 0))
                                             {
-                                                WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+                                                wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�");
                                             }
                                             else
                                             {
-                                                WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+                                                wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
                                             }
 
                                             //鍫嗗灈鏈哄啓瀹屾垚
                                             if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
                                             {
-                                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+                                                wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔燂細true");
                                             }
                                             else
                                             {
-                                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+                                                wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�:true");
+
                                             }
                                         }
 
@@ -395,24 +505,25 @@
                                         // 娓呴櫎杈撻�佺嚎
                                         if (PLCSignal(conveyorLine, task.TargetAddress, 0))
                                         {
-                                            WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+                                            wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0");
                                         }
                                         else
                                         {
-                                            WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+                                            wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0澶辫触");
                                         }
                                     }
                                 }
                             }
                             else
                             {
-                                WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎0-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+                                wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎0-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
+
                             }
                         }
                     }
                     else
                     {
-                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒板爢鍨涙満鏀捐揣瀹屾垚淇″彿", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+                        wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌鍫嗗灈鏈烘斁璐у畬鎴愪俊鍙�");
                     }
                 }
             }
@@ -435,22 +546,23 @@
                         {
                             if (Releasespermitted2(commonStackerCrane, task.SourceAddress,true))  //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
                             {
-                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                wcs_PLCto05(task.SourceAddress+"锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙锋垚鍔�:true");
                             }
                             else
                             {
-                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙锋垚鍔�:true");
                             }
                         }
                         else
                         {
                             if (Releasespermitted2(commonStackerCrane, task.SourceAddress,false))  //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
                             {
-                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:false");
                             }
                             else
                             {
-                                WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+
+                                wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触");
                             }
                            
                         }
@@ -460,6 +572,7 @@
                     {
                         if(PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 1))    //鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿
                         {
+                            wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿锛屽湴鍧�锛歿conveyorLine}");
                             DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked");    //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
                             if (deviceProDTO != null)
                             {
@@ -469,31 +582,36 @@
                                     //鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨�  鍫嗗灈鏈哄彇璧� 淇″彿
                                     if(Releasespermitted3(commonStackerCrane, task.SourceAddress,true))
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙锋垚鍔�:true");
                                     }
                                     else
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙峰け璐�:true");
                                     }
                                 }
                                 else
                                 {
                                     if (Releasespermitted3(commonStackerCrane, task.SourceAddress,false))
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false");
                                     }
                                     else
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false");
                                     }
                                 }
                             }
+                        }
+                        else
+                        {
+                            wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿澶辫触锛屽湴鍧�锛歿conveyorLine}");
                         }
                     }
                     else
                     {
                         if (PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 0))    //鍐欏叆杈撻�佺嚎娓呴櫎淇″彿
                         {
+                            wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎淇″彿鎴愬姛锛屽湴鍧�锛歿conveyorLine}");
                             DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked");    //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
                             if (deviceProDTO != null)
                             {
@@ -503,25 +621,29 @@
                                     //鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨�  鍫嗗灈鏈哄彇璧� 淇″彿
                                     if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙锋垚鍔�:true");
                                     }
                                     else
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙峰け璐�:true");
                                     }
                                 }
                                 else
                                 {
                                     if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false");
                                     }
                                     else
                                     {
-                                        WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+                                        wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false");
                                     }
                                 }
                             }
+                        }
+                        else
+                        {
+                            wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎淇″彿澶辫触锛屽湴鍧�锛歿conveyorLine}");
                         }
                     }
                 }
@@ -589,7 +711,14 @@
                     {
                         return true;
                     }
-                   
+                }
+                DeviceProDTO? deviceProDTO6 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_A2in");  //绌烘墭鍑哄叆搴�
+                if (deviceProDTO6 != null)
+                {
+                    if (GetStacker(commonStackerCrane, deviceProDTO6.DeviceProAddress).Status)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;
@@ -639,6 +768,15 @@
                 if (deviceProDTO != null)
                 {
                    if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+                }
+            }
+
+            if (Destinationaddress == "R01-002-043-001-01")
+            {
+                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_A2in");
+                if (deviceProDTO != null)
+                {
+                    if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                 }
             }
 
@@ -706,7 +844,17 @@
                     }
                 }
             }
-
+            if (Destinationaddress == "R01-002-043-001-01")
+            {
+                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_A2in");
+                if (deviceProDTO != null)
+                {
+                    if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+                    {
+                        return true;
+                    }
+                }
+            }
             return false;
 
         }
@@ -755,7 +903,14 @@
                     if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                 }
             }
-
+            if (Destinationaddress == "R01-002-043-001-01")
+            {
+                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_A2in");
+                if (deviceProDTO != null)
+                {
+                    if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+                }
+            }
             return false;
         }
 
@@ -1055,7 +1210,7 @@
         {
             StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
 
-            stackerCraneTaskCommand.Barcode = task.PalletCode;
+            stackerCraneTaskCommand.Barcode = ""; /*task.PalletCode;*/
             stackerCraneTaskCommand.TaskNum = task.TaskNum;
             stackerCraneTaskCommand.WorkType = 1;
             stackerCraneTaskCommand.TrayType = 0;
@@ -1148,5 +1303,29 @@
             }
             return stackerCraneTaskCommand;
         }
+
+
+        public void wcs_PLCto05(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("鍏ュ簱浜や簰淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+        public void wcs_PLCto06(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("鍑哄簱浜や簰淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+
+        public void wcs_PLCto07(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("浠诲姟淇℃伅瀹屾垚璁板綍", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+        public void wcs_PLCto07_1(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("浠诲姟淇℃伅瀹屾垚淇敼璁板綍", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
+
+        public void wcs_PLCto08(string SCLLinStack, string Logtype, string Magessadd)
+        {
+            WriteLog.Write_Log("鍑哄簱绔欏彴淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+        }
     }
 }

--
Gitblit v1.9.3