From 6fff0e3d3b6c9afc29b54d591012cb90475be149 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 14 七月 2025 10:42:21 +0800
Subject: [PATCH] 1

---
 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 2709 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 2,500 insertions(+), 209 deletions(-)

diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index 93e4d00..a5f4a54 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+#region    [鑷畾涔夌被-VS][20250623083459471][AutoThread]
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
@@ -14,6 +15,21 @@
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using System.Windows.Interop;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
+using System.Security.Cryptography;
+using System.Windows.Markup;
+using static GZ.Projects.AuxAllWCS.EasyPLC;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using ServiceStack.Configuration;
+using ServiceStack;
+using Spectre.Console;
+using System.Net.WebSockets;
+using System.Net;
+using System.Threading;
+using System.IO;
+using GZ.Device.Agv;
+using System.Net.NetworkInformation;
+using System.Windows.Documents;
+using System.Text.RegularExpressions;
 
 namespace GZ.Projects.AuxAllWCS
 {
@@ -65,6 +81,8 @@
             }
 
             // 鎵ц濮旀墭
+            //if (methodName != "TaskEverythingRun")
+            //    return null;
             return methodDelegate.DynamicInvoke(args);
         }
 
@@ -103,6 +121,154 @@
             {
                 tag.Global.SettingsOver = 0;
             }
+            else tag.Global.SettingsOver++;
+            if (tag.Global.SettingsOver > 999)
+            {
+                tag.Global.SettingsOver = 1;
+                Console.Clear();
+            }
+        }
+
+
+        public void ThreaTotal(Tag tag, Device device)
+        {
+            List<Task> tasks = new List<Task>();
+            tasks.Add(GetTask(delegate (Tag tag1, Device device1)
+            {
+                try
+                {
+                    foreach (var ip in new List<string> {
+                    device1.p鍙戦偅绉�涓嬬嚎.Config.IP,
+                    device1.p鍙戦偅绉�涓嬬嚎.Config.IP,
+                    device1.D瀹氬瓙1鍙锋満姊版墜.Config.IP,
+                    device1.D瀹氬瓙2鍙锋満姊版墜.Config.IP,
+                    device1.Js鎹烽『1.Config.IP,
+                    device1.Js鎹烽『2.Config.IP,
+                    device1.缁村笇灏旀姄鑷�.Config.IP,
+                    device1.缁村笇灏旀姄鑷�.Config.IP,
+                    device1.RGV.Config.IP,
+                    device1.S1002Read.Config.IP,
+                    device1.S2001Read.Config.IP,
+                    device1.S3001Read.Config.IP
+                })
+                    {
+                        string pattern = @"\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b";
+
+                        var matches = Regex.Match(ip, pattern);
+                        if (matches.Success)
+                        {
+                            var b = IsMachineOnline(matches.Value);
+                            if (!Iponlines.ContainsKey(ip))
+                            {
+                                Iponlines.TryAdd(ip, b);
+                            }
+                            else
+                                Iponlines[ip] = b;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error(ex.Message, ex);
+                }
+
+            }, tag, device, 3000));
+            tasks.Add(GetTask(ThreadMXC3, tag, 3000));
+            tasks.Add(GetTask(ThreadMXC4, tag, 3000));
+            tasks.Add(GetTask(ResetGats, tag, 3000));
+
+            tasks.Add(GetTask(sa1022, tag, 3000));
+            tasks.Add(GetTask(sa1025, tag, 3000));
+            tasks.Add(GetTask(sa1030, tag, 3000));
+            tasks.Add(GetTask(sa2001, tag, 3000));
+            tasks.Add(GetTask(sa2030, tag, 3000));
+            tasks.Add(GetTask(sa2008, tag, 3000));
+            tasks.Add(GetTask(sa3001, tag, 3000));
+            tasks.Add(GetTask(sa3005, tag, 3000));
+            tasks.Add(GetTask(sa3006, tag, 3000));
+            tasks.Add(GetTask(sa3010, tag, 3000));
+
+            Task.WaitAll(tasks.ToArray());
+        }
+
+        public static ConcurrentDictionary<string, bool> Iponlines = new ConcurrentDictionary<string, bool>();
+        public bool IsMachineOnline(string hostNameOrIp, int timeout = 1000)
+        {
+            //device.p鍙戦偅绉�涓嬬嚎.Config.IP
+            LogHelper.Info("妫�祴ip:>" + hostNameOrIp, "IP鍦ㄧ嚎妫�祴");
+            bool res = false;
+            try
+            {
+                using (var ping = new Ping())
+                {
+                    var reply = ping.Send(hostNameOrIp, timeout);
+                    res = reply.Status == IPStatus.Success;
+                }
+            }
+            catch (PingException)
+            {
+                res = false;
+            }
+            catch (Exception)
+            {
+                // 鍏朵粬寮傚父澶勭悊
+                res = false;
+            }
+            finally
+            {
+                LogHelper.Info("妫�祴ip:>" + hostNameOrIp + " 缁撴灉锛� + (res ? "閫� : "涓嶉�"), "IP鍦ㄧ嚎妫�祴");
+            }
+            return res;
+        }
+
+        private Task GetTask(Action<Tag> action, Tag tag, int i = 2500)
+        {
+            var task = Task.Run(() =>
+            {
+                while (true)
+                {
+                    try
+                    {
+                        action(tag);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Error(ex.Message, ex);
+                    }
+                    Thread.Sleep(i);
+                }
+            });
+            return task;
+        }
+
+        private Task GetTask(Action<Tag, Device> action, Tag tag, Device dev, int i = 2500)
+        {
+            var task = Task.Run(() =>
+            {
+                while (true)
+                {
+                    try
+                    {
+                        action(tag, dev);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Error(ex.Message, ex);
+                    }
+                    Thread.Sleep(i);
+                }
+            });
+            return task;
+        }
+        public string WriteLine(string value = "")
+        {
+
+
+
+
+            // 鍦ㄨ繖閲屾嫤鎴鐞嗚緭鍑�+            string intercepted = $"[鎷︽埅鍒扮殑杈撳嚭] {value}";
+            return intercepted;
         }
 
         /// <summary>
@@ -124,17 +290,20 @@
                         endBit = VERX.location[0]
                     }));
                     LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
-                    if (str.Contains("true"))
+                    var strr = JsonConvert.DeserializeObject<Messss>(str);
+                    if (strr != null && strr.success && strr.data?.state == 0)
                     {
                         //tag.Js1.D1212_LAST = 1;
-                        RedisHelper.Add($"Js鎹烽『1.D1212_LAST", "1", out string msg);
+                        RedisHelper.Add($"Js鎹烽『1.D1202_LAST", "1", out string msg);
                     }
                 }
                 if (tag.Js1.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 0)
                 {
                     //tag.Js1.D1212_LAST = 0; 
-                    RedisHelper.Add($"Js鎹烽『1.D1212_LAST", "0", out string msg);
+                    RedisHelper.Add($"Js鎹烽『1.D1202_LAST", "0", out string msg);
+                    //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1224", "0", VERX.deviceName + "Queue");
                 }
+
                 if (tag.Js1.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 1)
                 {
                     var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -143,16 +312,18 @@
                         endBit = VERX.location[1]
                     }));
                     LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
-                    if (str.Contains("true"))
+                    var strr = JsonConvert.DeserializeObject<Messss>(str);
+                    if (strr != null && strr.success && strr.data?.state == 0)
                     {
                         //tag.Js1.D1213_LAST = 1;
-                        RedisHelper.Add($"Js鎹烽『1.D1213_LAST", "1", out string msg);
+                        RedisHelper.Add($"Js鎹烽『1.D1203_LAST", "1", out string msg);
                     }
                 }
                 if (tag.Js1.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 0)
                 {
                     //tag.Js1.D1213_LAST = 0;
-                    RedisHelper.Add($"Js鎹烽『1.D1213_LAST", "0", out string msg);
+                    RedisHelper.Add($"Js鎹烽『1.D1203_LAST", "0", out string msg);
+                    //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1225", "0", VERX.deviceName + "Queue");
                 }
             }
         }
@@ -175,18 +346,17 @@
                         endBit = VERX.location[0]
                     }));
                     LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
-                    if (str.Contains("true"))
+                    var strr = JsonConvert.DeserializeObject<Messss>(str);
+                    if (strr != null && strr.success && strr.data?.state == 0)
                     {
-                        //tag.Js2.D1212_LAST = 1;
-
-                        RedisHelper.Add($"Js鎹烽『1.D1212_LAST", "1", out string msg);
+                        RedisHelper.Add($"Js鎹烽『2.D1202_LAST", "1", out string msg);
                     }
                 }
                 if (tag.Js2.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 0)
                 {
                     //tag.Js2.D1212_LAST = 0;
 
-                    RedisHelper.Add($"Js鎹烽『1.D1212_LAST", "0", out string msg);
+                    RedisHelper.Add($"Js鎹烽『2.D1202_LAST", "0", out string msg);
                 }
                 if (tag.Js2.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 3) == 1)
                 {
@@ -196,18 +366,18 @@
                         endBit = VERX.location[1]
                     }));
                     LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
-                    if (str.Contains("true"))
-                    {
-                        //tag.Js2.D1213_LAST = 1;
 
-                        RedisHelper.Add($"Js鎹烽『1.D1213_LAST", "1", out string msg);
+                    var strr = JsonConvert.DeserializeObject<Messss>(str);
+                    if (strr != null && strr.success && strr.data?.state == 0)
+                    {
+                        RedisHelper.Add($"Js鎹烽『2.D1203_LAST", "1", out string msg);
                     }
                 }
                 if (tag.Js2.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1213, 2) == 0)
                 {
                     //tag.Js2.D1213_LAST = 0;
 
-                    RedisHelper.Add($"Js鎹烽『1.D1213_LAST", "0", out string msg);
+                    RedisHelper.Add($"Js鎹烽『2.D1203_LAST", "0", out string msg);
                 }
             }
         }
@@ -222,9 +392,11 @@
 
             if (VERX != null)
             {
+                if (tag.wxr1.R44)
+                    LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R44} R44LAST>{tag.wxr1.R44_LAST} R10>{tag.wxr1.R10}");
                 if (tag.wxr1.R44 && !tag.wxr1.R44_LAST && tag.wxr1.R10)
                 {
-                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
+                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                     {
                         var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
                         {
@@ -234,9 +406,11 @@
                             endBit = ""
                         }));
                         LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
-                        if (str.Contains("true"))
+                        var strr = JsonConvert.DeserializeObject<Messss>(str);
+                        if (strr != null && strr.success && strr.data?.state == 0)
                         {
-                            tag.wxr1.R44_LAST = true;
+                            //tag.wxr1.R44_LAST = true;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "true", out string msg);
                         }
                     }
                     else
@@ -251,23 +425,30 @@
                     {
                         if (tag.wxr1.R10)
                         {
-                            tag.wxr1.R10_LAST = false;
+                            //tag.wxr1.R10_LAST = false;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R10_LAST", "false", out string msg);
                         }
                         else
-                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
+                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                         {
                             //涓婃姤鏍¢獙銆�+                            LogHelper.Info($"{VERX.deviceNo[0]} 涓婃姤鏍¢獙>{traycode}");
+
                             ///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
                             var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
                             {
                                 sceneType = 1,
                                 cntrCode = traycode,
                             }));
-                            if (str.Contains("true"))
+                            var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+                            if (strr != null && strr.success)
+                            //if (str.Contains("true"))
                             {
                                 //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
-                                tag.wxr1.R10 = true;
-                                tag.wxr1.R44_LAST = false;
+                                //tag.wxr1.R10 = true;
+                                Conn.榛樿Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
+                                //tag.wxr1.R44_LAST = false;
+                                RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
                             }
                             else
                             {
@@ -275,6 +456,10 @@
                             }
                         }
                         else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+                    }
+                    else if (!tag.wxr1.R10)
+                    {
+                        TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
                     }
                 }
             }
@@ -291,9 +476,11 @@
 
             if (VERX != null)
             {
+                if (tag.wxr1.R46)
+                    LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr1.R46} R46LAST>{tag.wxr1.R46_LAST} R11>{tag.wxr1.R11}");
                 if (tag.wxr1.R46 && !tag.wxr1.R46_LAST && tag.wxr1.R11)
                 {
-                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
+                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                     {
                         var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
                         {
@@ -303,9 +490,11 @@
                             endBit = ""
                         }));
                         LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
-                        if (str.Contains("true"))
+                        var strr = JsonConvert.DeserializeObject<Messss>(str);
+                        if (strr != null && strr.success && strr.data?.state == 0)
                         {
-                            tag.wxr1.R46_LAST = true;
+                            //tag.wxr1.R46_LAST = true;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "true", out string msg);
                         }
                     }
                     else
@@ -319,23 +508,29 @@
                     {
                         if (tag.wxr1.R11)
                         {
-                            tag.wxr1.R11_LAST = false;
+                            //tag.wxr1.R11_LAST = false;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R11_LAST", "false", out string msg);
                         }
                         else
-                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
+                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                         {
                             //涓婃姤鏍¢獙銆�+                            LogHelper.Info($"{VERX.deviceNo[1]} 涓婃姤鏍¢獙>{traycode}");
                             ///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
                             var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
                             {
                                 sceneType = 1,
                                 cntrCode = traycode,
                             }));
-                            if (str.Contains("true"))
+                            var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+                            if (strr != null && strr.success)
+                            //if (str.Contains("true"))
                             {
                                 //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
-                                tag.wxr1.R11 = true;
-                                tag.wxr1.R46_LAST = false;
+                                //tag.wxr1.R11 = true;
+                                Conn.榛樿Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
+                                //tag.wxr1.R46_LAST = false;
+                                RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
                             }
                             else
                             {
@@ -343,6 +538,10 @@
                             }
                         }
                         else { TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+                    }
+                    else if (!tag.wxr1.R11)
+                    {
+                        TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
                     }
                 }
             }
@@ -359,9 +558,11 @@
 
             if (VERX != null)
             {
+                if (tag.wxr2.R44)
+                    LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R44} R44LAST>{tag.wxr2.R44_LAST} R10>{tag.wxr2.R10}");
                 if (tag.wxr2.R44 && !tag.wxr2.R44_LAST && tag.wxr2.R10)
                 {
-                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
+                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                     {
                         var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
                         {
@@ -371,9 +572,11 @@
                             endBit = ""
                         }));
                         LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
-                        if (str.Contains("true"))
+                        var strr = JsonConvert.DeserializeObject<Messss>(str);
+                        if (strr != null && strr.success && strr.data?.state == 0)
                         {
-                            tag.wxr2.R44_LAST = true;
+                            //tag.wxr2.R44_LAST = true;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "true", out string msg);
                         }
                     }
                     else
@@ -387,23 +590,29 @@
                     {
                         if (tag.wxr2.R10)
                         {
-                            tag.wxr2.R10_LAST = false;
+                            //tag.wxr2.R10_LAST = false;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R10_LAST", "false", out string msg);
                         }
                         else
-                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
+                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                         {
                             //涓婃姤鏍¢獙銆�+                            LogHelper.Info($"{VERX.deviceNo[0]} 涓婃姤鏍¢獙>{traycode}");
                             ///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
                             var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
                             {
                                 sceneType = 1,
                                 cntrCode = traycode,
                             }));
-                            if (str.Contains("true"))
+                            var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+                            if (strr != null && strr.success)
+                            //if (str.Contains("true"))
                             {
                                 //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
-                                tag.wxr2.R10 = true;
-                                tag.wxr2.R44_LAST = false;
+                                //tag.wxr2.R10 = true;
+                                Conn.榛樿Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
+                                //tag.wxr2.R44_LAST = false;
+                                RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
                             }
                             else
                             {
@@ -411,6 +620,10 @@
                             }
                         }
                         else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+                    }
+                    else if (!tag.wxr2.R10)
+                    {
+                        TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
                     }
                 }
             }
@@ -428,9 +641,11 @@
 
             if (VERX != null)
             {
+                if (tag.wxr2.R46)
+                    LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr2.R46} R46LAST>{tag.wxr2.R46_LAST} R11>{tag.wxr2.R11}");
                 if (tag.wxr2.R46 && !tag.wxr2.R46_LAST && tag.wxr2.R11)
                 {
-                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
+                    if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                     {
                         var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
                         {
@@ -440,27 +655,33 @@
                             endBit = ""
                         }));
                         LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
-                        if (str.Contains("true"))
+                        var strr = JsonConvert.DeserializeObject<Messss>(str);
+                        if (strr != null && strr.success && strr.data?.state == 0)
                         {
-                            tag.wxr2.R46_LAST = true;
+                            //tag.wxr2.R46_LAST = true;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "true", out string msg);
                         }
                     }
                     else
                     {
-                        TcpServer.TcpServerSend(VERX.deviceNo[2], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
+                        TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
                     }
                 }
                 else
                 {
+                    //LogHelper.Info($"Threadwxr2R 鎵樼洏鏀剧疆淇″彿1銆傘�  -{tag.wxr2.R11_LAST}");
                     if (tag.wxr2.R11_LAST) //鎵樼洏鏀剧疆淇″彿銆傘�
                     {
+                        //LogHelper.Info($"Threadwxr2R 鎵樼洏鏀剧疆淇″彿1銆傘�  -{tag.wxr2.R11}");
                         if (tag.wxr2.R11)
                         {
-                            tag.wxr2.R11_LAST = false;
+                            //tag.wxr2.R11_LAST = false;
+                            RedisHelper.Add($"缁村笇灏旀姄鑷�.R11_LAST", "false", out string msg);
                         }
                         else
-                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
+                        if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
                         {
+                            LogHelper.Info($"{VERX.deviceNo[1]} 涓婃姤鏍¢獙>{traycode}");
                             //涓婃姤鏍¢獙銆�                             ///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
                             var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
@@ -468,23 +689,40 @@
                                 sceneType = 1,
                                 cntrCode = traycode,
                             }));
-                            if (str.Contains("true"))
+                            var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+                            if (strr != null && strr.success)
                             {
-                                //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
-                                tag.wxr2.R11 = true;
-                                tag.wxr2.R46_LAST = false;
+                                //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R11", "true", "缁村笇灏旀姄鑷�Queue");
+                                //tag.wxr2.R11 = true;
+
+                                LogHelper.Info($"Threadwxr2R銆傘�  -鍐橰11 true");
+                                Conn.榛樿Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
+                                //tag.wxr2.R46_LAST = false;
+                                RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
+                                LogHelper.Info($"Threadwxr2R銆傘� 鏍¢獙涓嬫枡瀹屾垚銆�);
                             }
                             else
                             {
                                 //鎶ヨ銆�                             }
                         }
-                        else { TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+                        else
+                        {
+                            LogHelper.Info($"Threadwxr2R銆傘�  -鍙戦�鎵爜");
+                            TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
+                        }
+                    }
+                    else if (!tag.wxr2.R11)
+                    {
+                        TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
                     }
                 }
             }
+            else
+            {
+                Console.WriteLine($"Threadwxr2R 缁村笇灏� 鍙� 璁惧鏈壘鍒般� =================> ");
+            }
         }
-
 
         public void ThreadTaskRun(Tag tag, Func<TaskEntity, bool> action)
         {
@@ -494,7 +732,7 @@
             ITaskRepository taskservice = new TaskRepository();
             try
             {
-                LogHelper.Info("浠诲姟涓嬪彂  ARG 浠诲姟 杩涘叆");
+                LogHelper.Info("浠诲姟涓嬪彂  AGV 浠诲姟 杩涘叆");
                 #region AGV浠诲姟涓嬪彂銆� 
                 var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "AGV");
@@ -535,21 +773,60 @@
             }
             try
             {
-                LogHelper.Info("浠诲姟涓嬪彂  Rgv 浠诲姟 杩涘叆");
                 #region Rgv
 
-                LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠g爜锛氥�{tag.RGV.RgvrunError}銆�);
+                LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠g爜锛氥�{tag.RGV.RgvrunError}銆�鎵嬪姩1鑷姩2銆恵tag.RGV.R鎵嬪姩1鑷姩2}銆�);
+
+                if (tag.RGV.R鍏呯數鐘舵� == 1)
+                {
+                    LogHelper.Info($"RGV 鍏呯數妯″紡锛屼笉鐢ㄧ銆�);
+                    return;
+                }
+                if (tag.RGV.R鎵嬪姩1鑷姩2 == 1)
+                {
+                    LogHelper.Info($"RGV 鎵嬪姩妯″紡锛屼笉鐢ㄧ銆�);
+                    return;
+                }
+                if (tag.RGV.RgvrunError > 0)
+                {
+                    LogHelper.Info($"RGV 鏁呴殰锛屼笉鐢ㄧ銆�);
+                    return;
+                }
+                LogHelper.Info($"RGV125鍛戒护鏌ョ湅 浠诲姟鏁版嵁 workmode:{tag.RGV.workMod}\n taskmod{tag.RGV.taskmod} \n t1No:{tag.RGV.taskno1}\n t1do:{tag.RGV.task1do} \n t2No:{tag.RGV.taskno2}\n t2do:{tag.RGV.task2do}\n taskend:{tag.RGV.taskend} ");
+                if (tag.RGV.taskend == 125)
+                {
+                    LogHelper.Info($"RGV 鏈�25鍛戒护鏈墽琛屻� ");
+
+                    if (tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No)
+                    {
+                        LogHelper.Info($"RGV125鍛戒护鏈墽琛�tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No  鑷姩娓呴櫎125");
+                        Conn.榛樿Redis.SetValue("RGV.taskend", "0", "RGVQueue", false);
+                    }
+                    System.Threading.Thread.Sleep(3000);
+                    return;
+                }
+                LogHelper.Info($"浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆 Rgv淇℃伅 W1鐘舵�{tag.RGV.w1status} ReadTask1No>{tag.RGV.ReadTask1No} 1宸ヤ綅鏉$爜:{tag.RGV.bit1Code} bit1taskOver>{tag.RGV.bit1taskOver} W2鐘舵�{tag.RGV.w2status} ReadTask2No>{tag.RGV.ReadTask2No} 2宸ヤ綅鏉$爜:{tag.RGV.bit2Code} bit2taskOver>{tag.RGV.bit2taskOver}");
+                TaskEntity task1 = null;
+                TaskEntity task2 = null;
                 var task1Isrun = false;
                 if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
                 {
-                    task1Isrun = true;
+                    var taskno = tag.RGV.ReadTask1No;
+                    string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
+                    task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
+                    if (task1 != null && task1.S_B_STATE != "瀹屾垚")
+                        task1Isrun = true;
                     //if (tag.RGV.bit1taskOver_LAST == 1)
                     //    RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
                 }
                 var task2Isrun = false;
                 if (tag.RGV.ReadTask2No > 0 && tag.RGV.bit2taskOver != 1)
                 {
-                    task2Isrun = true;
+                    var taskno = tag.RGV.ReadTask2No;
+                    string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
+                    task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
+                    if (task2 != null && task2.S_B_STATE != "瀹屾垚")
+                        task2Isrun = true;
                     //if (tag.RGV.bit2taskOver_LAST == 1)
                     //    RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
                 }
@@ -561,12 +838,11 @@
                     if (task2Isrun)
                         mes += tag.RGV.ReadTask2No + "鎵ц涓�..";
                     LogHelper.Info($"{mes} 涓嶈兘涓嬪彂鏂颁换鍔°�");
-                    throw new Exception($"{mes} 涓嶈兘涓嬪彂鏂颁换鍔°�");
+                    System.Threading.Thread.Sleep(3000);
+                    return;
                 }
-                var thisOver = 0;
-                TaskEntity task1 = null;
-                TaskEntity task2 = null;
 
+                var thisOver = 0;
                 LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅浠诲姟銆�);
                 if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver == 1)
                 {
@@ -575,7 +851,7 @@
                     string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
                     task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
 
-                    LogHelper.Info($"RGV 1宸ヤ綅浠诲姟{JsonConvert.SerializeObject(task1)}.bit1taskOver_LAST锛歿tag.RGV.bit1taskOver_LAST}");
+                    LogHelper.Info($"RGV 1宸ヤ綅浠诲姟{task1?.S_TASK_NO}.bit1taskOver_LAST锛歿tag.RGV.bit1taskOver_LAST}");
                     if (tag.RGV.bit1taskOver_LAST == 0 && task1 != null)
                     {
                         if (task1.S_B_STATE != "瀹屾垚")
@@ -584,12 +860,14 @@
                             if (task1.S_B_STATE == "鍙栬揣瀹屾垚")
                             {
                                 task1.S_B_STATE = "瀹屾垚";
+                                tag.RGV.ReadTask1No = 0;
                             }
                             else
                             {
                                 task1.S_B_STATE = "鍙栬揣瀹屾垚";
                             }
-                            LogHelper.Info($"RGV 1宸ヤ綅浠诲姟{task1.S_TASK_NO} 鐘舵�鍒囨崲涓簕task1.S_B_STATE}");
+                            //tag.RGV.bit1taskOver = 0;
+                            LogHelper.Info($"RGV 1宸ヤ綅浠诲姟{task1.S_TASK_NO} 鏉$爜锛歿tag.RGV.bit1Code} 鐘舵�鍒囨崲涓簕task1.S_B_STATE}");
                             //tag.RGV.bit1taskOver_LAST = 1;
                             RedisHelper.Add($"RGV.bit1taskOver_LAST", "1", out string msg);
                             LogHelper.Info($"RGV 1宸ヤ綅浠诲姟鍐欏鐞�);
@@ -615,7 +893,7 @@
                     string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
                     task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
 
-                    LogHelper.Info($"RGV2宸ヤ綅浠诲姟{JsonConvert.SerializeObject(task2)}.bit2taskOver_LAST锛歿tag.RGV.bit2taskOver_LAST}");
+                    LogHelper.Info($"RGV2宸ヤ綅浠诲姟{task2?.S_TASK_NO}.bit2taskOver_LAST锛歿tag.RGV.bit2taskOver_LAST}");
                     if (tag.RGV.bit2taskOver_LAST == 0 && task2 != null)
                     {
                         if (task2.S_B_STATE != "瀹屾垚")
@@ -624,12 +902,14 @@
                             if (task2.S_B_STATE == "鍙栬揣瀹屾垚")
                             {
                                 task2.S_B_STATE = "瀹屾垚";
+                                tag.RGV.ReadTask2No = 0;
                             }
                             else
                             {
                                 task2.S_B_STATE = "鍙栬揣瀹屾垚";
                             }
-                            LogHelper.Info($"RGV 2宸ヤ綅浠诲姟{task2.S_TASK_NO} 鐘舵�鍒囨崲涓簕task2.S_B_STATE}");
+                            //tag.RGV.bit2taskOver = 0;
+                            LogHelper.Info($"RGV 2宸ヤ綅浠诲姟{task2.S_TASK_NO} 鏉$爜锛歿tag.RGV.bit2Code} 鐘舵�鍒囨崲涓簕task2.S_B_STATE}");
                             RedisHelper.Add($"RGV.bit2taskOver_LAST", "1", out string msg);
                             LogHelper.Info($"RGV 2宸ヤ綅浠诲姟鍐欏鐞�);
                             taskservice.Update(task2);
@@ -647,17 +927,30 @@
                 }
 
                 //if (thisOver > 0)
-                {
-                    var v2 = RedisHelper.Get<WriteGroupEntity>("RGVQueue", out string rev);
-                    if (v2 != null)
+                //{
+                //    var v2 = RedisHelper.Get<WriteGroupEntity>("RGVQueue", out string rev);
+                //    if (v2 != null)
+                //    {
+                //        LogHelper.Info($"RGVQueue 璇诲埌缁撴灉-{JsonConvert.SerializeObject(v2)}  \n 涓嬪彂鍓嶈繘琛屾竻闄ゃ�");
+                //        var b = RedisHelper.Remove("RGVQueue", out rev);
+                //    }
+                //}
+                var tklistall = taskservice.FindList(x => x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷" && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
+                var tklist = tklistall.FindAll(x => x.S_B_STATE == "鏈墽琛�);
+                var tkunNormal = tklistall.Except(tklist);
+                if (tkunNormal.Any())
+                    foreach (var tk in tkunNormal)
                     {
-                        LogHelper.Info($"RGVQueue 璇诲埌缁撴灉-{JsonConvert.SerializeObject(v2)}  \n 涓嬪彂鍓嶈繘琛屾竻闄ゃ�");
-                        var b = RedisHelper.Remove("RGVQueue", out rev);
+                        if (tk.S_TASK_NO != task1?.S_TASK_NO && tk.S_TASK_NO != task2?.S_TASK_NO)
+                        {
+                            tk.S_B_STATE = "鍙栨秷";
+                            tk.S_NOTE = "涓嶅湪鎵ц闃熷垪涓�鍙栨秷";
+                            taskservice.Update(tk);
+                        }
                     }
-                }
 
                 ///1 鏈夎揣  灏� 鍙栥�  1 娌¤揣 灏� 鍗歌揣锛�閮芥湁璐� 灏�鍗歌揣銆�閮芥病璐�灏�鍗�-                var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
+                // taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
                 if (task1 != null && task1.S_B_STATE != "瀹屾垚") //1鏈変换鍔�                 {
                     if (task2 != null && task2.S_B_STATE != "瀹屾垚")// 1 鏈変换鍔� 2 鏈変换鍔°� 
@@ -667,15 +960,17 @@
                         tag.RGV.taskmod = 2;
                         tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
                         tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
-                        System.Threading.Thread.Sleep(750);
                         //RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
                         //tag.RGV.taskend = 125;
                         //Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue");
 
-                        LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
-                        RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
+                        if (tag.RGV.bit1taskOver == 1)
+                            tag.RGV.bit1taskOver = 0;
                         LogHelper.Info($"{task1.S_TASK_NO}> end 鍐�125");
                         Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+
+                        LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
+                        RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
                     }
                     else //1鏈変换鍔� 2 娌′换鍔°�  
                     {
@@ -688,21 +983,25 @@
 
                         // 2鍙�浼樺厛缁�1020  1008  1016
                         var t2 = tklist.OrderBy(x => x.T_CREATE).ToList().Find(x => x.S_START_LOC == "1020" || x.S_START_LOC == "1008" || x.S_START_LOC == "1016");
-                        if (tklist != null)
+                        if (t2 != null)
                         {
                             LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵�020  1008  1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
                             tag.RGV.workMod = 2;
+                            LogHelper.Info($"{t2.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
                             tag.RGV.taskmod = 1;
+                            LogHelper.Info($"{t2.S_TASK_NO}> taskmod 1 銆婂彇璐с�");
                             tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
                             tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
-                            t2.S_B_STATE = "宸叉帹閫�;
-                            taskservice.Update(t2);
-                            creT2 = true;
-                            System.Threading.Thread.Sleep(750);
-                            LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
-                            RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+
+                            if (tag.RGV.bit2taskOver == 1)
+                                tag.RGV.bit2taskOver = 0;
                             LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
                             Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+
+                            LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+                            RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+                            t2.S_B_STATE = "宸叉帹閫�;
+                            taskservice.Update(t2);
                         }
                         ////2 濡傛灉鏈夊悓渚у彇璐т换鍔°�灏卞彇銆傛病鏈�                         //else if (leftSide.Contains(task1.S_START_LOC))
@@ -753,14 +1052,18 @@
                         {
                             LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 娌℃湁鍚屼晶鍙栬揣浠诲姟 1宸ヤ綅鍗歌揣銆�);
                             tag.RGV.workMod = 1;
+                            LogHelper.Info($"{task1.S_TASK_NO}> workMod 1 銆�宸ヤ綅銆�);
                             tag.RGV.taskmod = 2;
+                            LogHelper.Info($"{task1.S_TASK_NO}> taskmod 2 銆婂嵏璐с�");
                             tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
                             tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
-                            System.Threading.Thread.Sleep(750);
+
+                            if (tag.RGV.bit1taskOver == 1)
+                                tag.RGV.bit1taskOver = 0;
+                            LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�125");
+                            Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
                             LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
                             RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
-                            LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�0");
-                            Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
                         }
                     }
                 }
@@ -771,15 +1074,19 @@
                         LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅娌′换鍔�宸ヤ綅2 鏈変换鍔task2.S_TASK_NO}銆傚伐浣�鍗歌揣銆傘�");
                         //2 鍗歌揣銆�                         tag.RGV.workMod = 2;
+                        LogHelper.Info($"{task2.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
                         tag.RGV.taskmod = 2;
+                        LogHelper.Info($"{task2.S_TASK_NO}> taskmod 2 銆婂嵏璐с�");
                         tag.RGV.taskno2 = Convert.ToUInt32(task2.S_TASK_NO.Substring(4));
                         tag.RGV.task2do = Convert.ToUInt16(task2.S_END_LOC);
-                        System.Threading.Thread.Sleep(750);
-                        LogHelper.Info($"{task2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
-                        RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+
+                        if (tag.RGV.bit2taskOver == 1)
+                            tag.RGV.bit2taskOver = 0;
                         //tag.RGV.taskend = 125;
                         LogHelper.Info($"{task2.S_TASK_NO}> taskend 鍐�25");
                         Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+                        LogHelper.Info($"{task2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+                        RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
                     }
                     else if (tklist.Any()) //1mei 浠诲姟  2 娌′换鍔°�
                     {
@@ -793,42 +1100,48 @@
                         //}
                         if (e1017first != null)
                         {
-                            LogHelper.Info($"鏌ョ湅RGV1 浠诲姟宸ヤ綅2 娌′换鍔°� 1002  1010  1023鍙栬揣浠诲姟{e1017first.S_TASK_NO}銆�);
+                            LogHelper.Info($"鏌ョ湅RGV娌′换鍔★紝 缁欏伐浣�绛涢�浠诲姟銆�1002  1010  1023鍙栬揣浠诲姟{e1017first.S_TASK_NO}銆�);
                             tag.RGV.workMod = 1;
+                            LogHelper.Info($"{e1017first.S_TASK_NO}> workMod 1 銆�宸ヤ綅銆�);
                             tag.RGV.taskmod = 1;
+                            LogHelper.Info($"{e1017first.S_TASK_NO}> taskmod 1 銆婂彇璐с�");
                             uint tno = Convert.ToUInt32(e1017first.S_TASK_NO.Substring(4));
                             LogHelper.Info($"{e1017first.S_TASK_NO}> 杞崲鍚庝换鍔″彿{tno} 寮�鍐欏叆銆�);
                             tag.RGV.taskno1 = tno;
                             LogHelper.Info($"{e1017first.S_TASK_NO}>寮�鍐欏叆 task1do>>{e1017first.S_START_LOC}銆�);
                             tag.RGV.task1do = Convert.ToUInt16(e1017first.S_START_LOC);
+                            //tag.RGV.taskend=125
+                            if (tag.RGV.bit1taskOver == 1)
+                                tag.RGV.bit1taskOver = 0;
+                            LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
+                            Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+                            LogHelper.Info($"{e1017first.S_TASK_NO}> bit1taskOver_LAST 鍐�");
+                            RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
                             LogHelper.Info($"{e1017first.S_TASK_NO}> 鏇存柊浠诲姟銆�);
                             e1017first.S_B_STATE = "宸叉帹閫�;
                             taskservice.Update(e1017first);
-                            System.Threading.Thread.Sleep(750);
-                            LogHelper.Info($"{e1017first.S_TASK_NO}> bit1taskOver_LAST 鍐�");
-                            RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
-                            LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
-                            //tag.RGV.taskend=125
-                            Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
-
                         }
                         else
                         {
                             var t2 = tklist.OrderBy(x => x.T_CREATE).ToList().Find(x => x.S_START_LOC == "1020" || x.S_START_LOC == "1008" || x.S_START_LOC == "1016");
                             if (tklist != null)
                             {
-                                LogHelper.Info($"鏌ョ湅RGV1 娌′换鍔″伐浣� 娌′换鍔°� 鎵�020  1008  1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
+                                LogHelper.Info($"鏌ョ湅RGV娌′换鍔�缁欏伐浣�绛涢�浠诲姟銆�鎵�020  1008  1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
                                 tag.RGV.workMod = 2;
+                                LogHelper.Info($"{t2.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
                                 tag.RGV.taskmod = 1;
+                                LogHelper.Info($"{t2.S_TASK_NO}> taskmod 1 銆婂彇璐с�");
                                 tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
+                                LogHelper.Info($"{t2.S_TASK_NO}> taskno2  {Convert.ToUInt32(t2.S_TASK_NO.Substring(4))}銆婁换鍔″彿銆�);
                                 tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
-                                t2.S_B_STATE = "宸叉帹閫�;
-                                taskservice.Update(t2);
-                                System.Threading.Thread.Sleep(750);
-                                LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
-                                RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+                                if (tag.RGV.bit2taskOver == 1)
+                                    tag.RGV.bit2taskOver = 0;
                                 LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
                                 Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+                                LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+                                RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+                                t2.S_B_STATE = "宸叉帹閫�;
+                                taskservice.Update(t2);
                             }
                         }
                     }
@@ -845,21 +1158,42 @@
 
         public void ThreadGrats(Tag tag, Action<HaiKangOrderInfo> continueTask)
         {
-            Console.WriteLine($"ThreadGrats 鍏夋爡澶勭悊 =================> ");
+            LogHelper.Info($"ThreadGrats 鍏夋爡澶勭悊 =================> ");
+
             var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
             TaskActRepository taskActRepository = new TaskActRepository();
             TaskRepository taskRepository = new TaskRepository();
-            var requires = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0);
+            var requires = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE).ToList();
+            var timeMorhours = requires.FindAll(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours > 1);
+            if (timeMorhours.Any())
+            {
+                foreach (var mor in timeMorhours)
+                {
+                    mor.N_CREATEMETHOD = 2;
+                    mor.S_REVIEW_COMMENT = "瓒呮椂涓嶅鐞�;
+                    taskActRepository.Update(mor);
+                }
+                requires = requires.Except(timeMorhours).ToList();
+            }
             foreach (var item in requires)
             {
+                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE}鍏夋爡澶勭悊 =================> ");
                 var tin = taskCOdes.IndexOf(item.S_ACTION_CODE);
                 if (tin == -1)
                 {
                     item.N_CREATEMETHOD = -1;
+                    item.S_REVIEW_COMMENT = $"淇″彿鏈煡{item.S_ACTION_CODE}涓嶅鐞�;
                     taskActRepository.Update(item);
                     continue;
                 }
-                //var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
+                var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
+                if (task == null)
+                {
+                    item.N_CREATEMETHOD = -1;
+                    item.S_REVIEW_COMMENT = $"浠诲姟涓㈠け涓嶅鐞�;
+                    taskActRepository.Update(item);
+                    continue;
+                }
                 string loc = "";
                 if (tin < 2)
                 {
@@ -875,62 +1209,315 @@
                 var dev = Settings.deviceInfos.Find(x => x.location.Contains(loc));
                 if (dev != null)
                 {
+                    LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡澶勭悊 =================> ");
                     var V = dev.location.ToList().FindIndex(x => x == loc) == 0;
                     //杞﹁蛋浜� 寮�厜鏍�                     if (!goin)
                     {
-                        if (dev.deviceType == 1)
+                        if (dev.deviceType == 4)
                         {
-                            LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue"));
-                            Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue");
-
+                            LogHelper.Info($"杞︾寮�緭閫佺嚎浜や簰>  {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} SSX AGV 浜や簰銆傘�銆�);
+                            switch (loc)
+                            {
+                                case "1019":
+                                    {
+                                        SetRedistoPlc("A1019鍙栬揣浜や簰.SOver", "true", "A1019鍙栬揣浜や簰Queue", "agv 鍙栬揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "1030":
+                                    {
+                                        SetRedistoPlc("A1030鍙栬揣浜や簰.SOver", "true", "A1030鍙栬揣浜や簰Queue", "agv 鍙栬揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "2030":
+                                    {
+                                        SetRedistoPlc("A2030鍙栬揣浜や簰.SOver", "true", "A2030鍙栬揣浜や簰Queue", "agv 鍙栬揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "3005":
+                                    {
+                                        SetRedistoPlc("A3005鍙栬揣浜や簰.SOver", "true", "A3005鍙栬揣浜や簰Queue", "agv 鍙栬揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "3010":
+                                    {
+                                        SetRedistoPlc("A3010鍙栬揣浜や簰.SOver", "true", "A3010鍙栬揣浜や簰Queue", "agv 鍙栬揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                //}
+                                //switch (loc)
+                                //{
+                                case "1022":
+                                    {
+                                        SetRedistoPlc("A1022鏀捐揣浜や簰.SOver", "true", "A1022鏀捐揣浜や簰Queue", "agv 鏀捐揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "1025":
+                                    {
+                                        SetRedistoPlc("A1025鏀捐揣浜や簰.SOver", "true", "A1025鏀捐揣浜や簰Queue", "agv 鏀捐揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "2001":
+                                    {
+                                        SetRedistoPlc("A2001鏀捐揣浜や簰.SOver", "true", "A2001鏀捐揣浜や簰Queue", "agv 鏀捐揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                        tag.SA2001.wTaskNo = 20012007;
+                                        tag.SA2001.wEbit = 2007;
+                                        tag.SA2001.w鎵樼洏鐮�= TaskProcess.GenerateTaskNo("铏氭嫙鎵樼洏鍙�).Substring(3);
+                                    }
+                                    break;
+                                case "3001":
+                                    {
+                                        SetRedistoPlc("A3001鏀捐揣浜や簰.SOver", "true", "A3001鏀捐揣浜や簰Queue", "agv 鏀捐揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                                case "3006":
+                                    {
+                                        SetRedistoPlc("A3006鏀捐揣浜や簰.SOver", "true", "A3006鏀捐揣浜や簰Queue", "agv 鏀捐揣瀹屾垚鍐欏畬鎴愪氦浜�);
+                                    }
+                                    break;
+                            }
                         }
-                        else if (dev.deviceType == 2)
+                        else
                         {
-                            LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue"));
-                            Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue");
-                        }
+                            if (dev.deviceType == 1)
+                            {
+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊 =================> ");
+                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue"));
+                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue", false);
+                            }
+                            else if (dev.deviceType == 2)
+                            {
+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊 =================> ");
+                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue"));
 
+                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "0", dev.deviceName + "Queue");
+                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue");
+                            }
+                            else if (dev.deviceType == 5)
+                            {
+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊 =================> ");
+                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "1", dev.deviceName + "Queue");
+                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "0", dev.deviceName + "Queue");
+                            }
+                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊瀹屾垚 =================> ");
+                        }
                         item.N_CREATEMETHOD = 1;
+                        item.S_REVIEW_COMMENT = $"鍏夋爡寮�惎瀹屾垚";
                         taskActRepository.Update(item);
                     }
                     //杞﹁杩涘叆浜や簰銆�                     else
                     {
-                        if (dev.deviceType == 1)
+                        if (dev.deviceType == 4)
                         {
-                            var tf = Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//璇诲叧闂姸鎬�-                            if (tf?.ToLower() == "true")
+                            LogHelper.Info($"杞﹁姹傝緭閫佺嚎浜や簰> {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} SSX AGV 浜や簰銆傘�銆�);
+                            //tag.SA1019.Sagverr
+                            switch (loc)
                             {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
-                                continuuuuu = true;
-                            }
-                            else
-                            {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
-                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue");
-                            }
-
-                        }
-                        else if (dev.deviceType == 2)
-                        {
-                            var tf = Conn.榛樿Redis.GetValue(dev.deviceName + ".D1202");
-                            int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
-                            if (TcpServer.GetBitdata(numm, (V ? 0 : 1)) == 1)
-                            {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
-                                continuuuuu = true;
-                            }
-                            else
-                            {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), dev.deviceName + "Queue"));
-                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");
+                                case "1019":
+                                    {
+                                        if (tag.SA1019.SreadCan)
+                                        {
+                                            LogHelper.Info($"1019 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A1019鍙栬揣浜や簰.Ssetreq", "true", "A1019鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA1019.StaskMode = 1;
+                                        }
+                                    }
+                                    break;
+                                case "1030":
+                                    {
+                                        if (tag.SA1030.SreadCan)
+                                        {
+                                            LogHelper.Info($"1030 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A1030鍙栬揣浜や簰.Ssetreq", "true", "A1030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA1030.StaskMode = 1;
+                                        }
+                                    }
+                                    break;
+                                case "2030":
+                                    {
+                                        if (tag.SA2030.SreadCan)
+                                        {
+                                            LogHelper.Info($"2030 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A2030鍙栬揣浜や簰.Ssetreq", "true", "A2030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA2030.StaskMode = 1;
+                                        }
+                                    }
+                                    break;
+                                case "3005":
+                                    {
+                                        if (tag.ssx杈撻�绾�s3005.SreadCan)
+                                        {
+                                            LogHelper.Info($"3005 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A3005鍙栬揣浜や簰.Ssetreq", "true", "A3005鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.ssx杈撻�绾�s3005.StaskMode = 1;
+                                        }
+                                    }
+                                    break;
+                                case "3010":
+                                    {
+                                        if (tag.ssx杈撻�绾�s3010.SreadCan)
+                                        {
+                                            LogHelper.Info($"3010 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A3010鍙栬揣浜や簰.Ssetreq", "true", "A3010鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.ssx杈撻�绾�s3010.StaskMode = 1;
+                                        }
+                                    }
+                                    break;
+                                //}
+                                //switch (loc)
+                                //{
+                                case "1022":
+                                    {
+                                        if (tag.SA1022.SreadCan)
+                                        {
+                                            LogHelper.Info($"1022 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A1022鏀捐揣浜や簰.Ssetreq", "true", "A1022鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA1022.StaskMode = 2;
+                                        }
+                                    }
+                                    break;
+                                case "1025":
+                                    {
+                                        if (tag.SA1025.SreadCan)
+                                        {
+                                            LogHelper.Info($"1025 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A1025鏀捐揣浜や簰.Ssetreq", "true", "A1025鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA1025.StaskMode = 2;
+                                        }
+                                    }
+                                    break;
+                                case "2001":
+                                    {
+                                        if (tag.SA2001.SreadCan)
+                                        {
+                                            LogHelper.Info($"2001 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A2001鏀捐揣浜や簰.Ssetreq", "true", "A2001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.SA2001.StaskMode = 2;
+                                        }
+                                    }
+                                    break;
+                                case "3001":
+                                    {
+                                        if (tag.ssx杈撻�绾�s3001.SreadCan)
+                                        {
+                                            LogHelper.Info($"3001 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A3001鏀捐揣浜や簰.Ssetreq", "true", "A3001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.ssx杈撻�绾�s3001.StaskMode = 2;
+                                        }
+                                    }
+                                    break;
+                                case "3006":
+                                    {
+                                        if (tag.ssx杈撻�绾�s3006.SreadCan)
+                                        {
+                                            LogHelper.Info($"3006 璇诲埌杈撻�绾垮厑璁搞�");
+                                            continuuuuu = true;
+                                        }
+                                        else
+                                        {
+                                            SetRedistoPlc("A3006鏀捐揣浜や簰.Ssetreq", "true", "A3006鏀捐揣浜や簰Queue", "鍐橝GV鐢宠");
+                                            tag.ssx杈撻�绾�s3006.StaskMode = 2;
+                                        }
+                                    }
+                                    break;
                             }
                         }
+                        else
+                        {
+                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊 =================> ");
+                            if (dev.deviceType == 1)
+                            {
+                                var tf = Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//璇诲叧闂姸鎬�+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{tf}");
+                                if (tf?.ToLower() == "true")
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
+                                }
+                            }
+                            else if (dev.deviceType == 2)
+                            {
+                                var tf = Conn.榛樿Redis.GetValue(dev.deviceName + ".D1202");
+                                int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
+                                int close = TcpServer.GetBitdata(numm, (V ? 0 : 1));
+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{close}");
+                                if (close == 1)
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue"));
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "0", dev.deviceName + "Queue");
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");
 
+                                    string d12201 = RedisHelper.Get<string>(dev.deviceName + "." + (V ? "D1220" : "D1221"), out string msg);
+                                    LogHelper.Info($"ThreadGrats 鍐檣(dev.deviceName + "." + (V ? "D1220" : "D1221"))}涓�1 锛�鍚庤{d12201}");
+                                }
+                            }
+                            else if (dev.deviceType == 5)
+                            {
+
+                                var close = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16));
+                                if (close == 0)
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "1", dev.deviceName + "Queue");
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "0", dev.deviceName + "Queue");
+                                }
+                            }
+                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊瀹屾垚 =================> ");
+                        }
                     }
-
                 }
+
                 if (continuuuuu)
                 {
                     LogHelper.Info($"{item.S_TASK_NO}{item.S_ACTION_CODE} 杞﹁締鍙戦�缁х画浠诲姟锛�);
@@ -940,27 +1527,70 @@
                         taskCode = item.S_TASK_NO
                     });
                     item.N_CREATEMETHOD = 1;
+                    item.S_REVIEW_COMMENT = $"杞﹀瓙缁х画浠诲姟OK";
                     taskActRepository.Update(item);
                 }
             }
             System.Threading.Thread.Sleep(3000);
+        }
+        public void ResetGats(Tag tag)
+        {
+            LogHelper.Info($"ThreadGrats deviceType2鍏夋爡鍐欏叆浣嶉噸缃�=================> ");
             //閲嶇疆淇″彿
             foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 2))
             {
                 var tf = Conn.榛樿Redis.GetValue(dev.deviceName + ".D1202");
                 int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
+                //int int0 = TcpServer.GetBitdata(numm, 0);
+                //int int1 = TcpServer.GetBitdata(numm, 1);
+
                 if (TcpServer.GetBitdata(numm, 0) == 0)
                 {
-                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1220", "0", dev.deviceName + "Queue");
-                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue");
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1220", "0", dev.deviceName + "Queue", false);
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue", false);
                 }
-                else if (TcpServer.GetBitdata(numm, 1) == 0)
+                if (TcpServer.GetBitdata(numm, 1) == 0)
                 {
-                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1221", "0", dev.deviceName + "Queue");
-                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1223", "0", dev.deviceName + "Queue");
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1221", "0", dev.deviceName + "Queue", false);
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1223", "0", dev.deviceName + "Queue", false);
+                }
+                if (TcpServer.GetBitdata(numm, 2) == 0)
+                {
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1224", "0", dev.deviceName + "Queue", false);
+                }
+                if (TcpServer.GetBitdata(numm, 3) == 0)
+                {
+                    Conn.榛樿Redis.SetValue(dev.deviceName + ".D1225", "0", dev.deviceName + "Queue", false);
                 }
             }
+            LogHelper.Info($"ThreadGrats deviceType2鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> ");
+            LogHelper.Info($"ThreadGrats deviceType5鍏夋爡鍐欏叆浣嶉噸缃�=================> ");
+            //閲嶇疆淇″彿
+            //foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 5))
 
+            {
+                //涓�嚎鍦板潃锛�0.221.55.181     绔彛锛�000
+                //if (IsMachineOnline("10.221.55.181"))
+                {
+                    if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
+                        //tag.DZ1.D2211 = 0;
+                        Conn.榛樿Redis.SetValue("D瀹氬瓙1鍙锋満姊版墜.D2211", "0", "D瀹氬瓙1鍙锋満姊版墜Queue", false);
+                    if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
+                        //tag.DZ1.D2216 = 0;
+                        Conn.榛樿Redis.SetValue("D瀹氬瓙1鍙锋満姊版墜.D2216", "0", "D瀹氬瓙1鍙锋満姊版墜Queue", false);
+                }
+                //浜岀嚎鍦板潃锛�0.221.55.179     绔彛锛�000
+                //if (IsMachineOnline("10.221.55.179"))
+                {
+                    if (tag.DZ2.D2211 == 1 && tag.DZ2.D2220 == 1)
+                        //tag.DZ2.D2211 = 0;
+                        Conn.榛樿Redis.SetValue("D瀹氬瓙2鍙锋満姊版墜.D2211", "0", "D瀹氬瓙2鍙锋満姊版墜Queue", false);
+                    if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
+                        //tag.DZ2.D2216 = 0;
+                        Conn.榛樿Redis.SetValue("D瀹氬瓙2鍙锋満姊版墜.D2216", "0", "D瀹氬瓙2鍙锋満姊版墜Queue", false);
+                }
+            }
+            LogHelper.Info($"ThreadGrats deviceType5鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> ");
         }
         /// <summary>
         /// 1020  1023绌烘涓嬬嚎
@@ -991,7 +1621,7 @@
                         var listtep = new List<string>();
                         if (Bssx == "1020")
                         {
-                            if (tag.SF涓嬫枡浣�RArrive1003 == 1)
+                            if (!string.IsNullOrEmpty(tag.SFT涓嬫枡鍙f墭鐩�R1003Barcode) && string.IsNullOrEmpty(tag.SFT涓嬫枡鍙f墭鐩�R1011Barcode))
                             {
                                 listtep = new List<string> { "1012", "1004" };
                             }
@@ -1002,7 +1632,8 @@
                         }
                         else
                         {
-                            if (tag.SF涓嬫枡浣�RArrive1005 == 1)
+                            //if (tag.SF涓嬫枡浣�RArrive1005 == 1)
+                            if (!string.IsNullOrEmpty(tag.SFT涓嬫枡鍙f墭鐩�R1005Barcode) && string.IsNullOrEmpty(tag.SFT涓嬫枡鍙f墭鐩�R1013Barcode))
                             {
                                 listtep = new List<string> { "1014", "1006" };
                             }
@@ -1111,6 +1742,19 @@
                         {
                             RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
                             RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out string msg2);
+
+                            LogHelper.Info($"{R鎵樼洏鐮亇 瀹氬瓙鐢熶骇瀹屾垚杩涜椴嶅伐锛侊紒");
+                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/223", JsonConvert.SerializeObject(new
+                            {
+                                cntrCode = R鎵樼洏鐮�
+                                type = 1,
+                                lineCode = "1002,1008".Contains(Bssx) ? "T01" : "T02"
+                            }));
+                            //var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                            //if (strr.success && strr.data != null)
+                            //{
+
+                            //}
                             //Conn.榛樿Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
                             //Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "1", $"S{item}ReadQueue");
                             break;
@@ -1168,6 +1812,13 @@
                         {
                             RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
                             RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out string msg1);
+                            LogHelper.Info($"{R鎵樼洏鐮亇 杞瓙鐢熶骇瀹屾垚杩涜椴嶅伐锛侊紒");
+                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/223", JsonConvert.SerializeObject(new
+                            {
+                                cntrCode = R鎵樼洏鐮�
+                                type = 2,
+                                lineCode = "1002,1008".Contains(Bssx) ? "T01" : "T02"
+                            }));
                             //Conn.榛樿Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
                             //Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "1", $"S{item}ReadQueue");
                             break;
@@ -1190,87 +1841,146 @@
         public void Thread涓嬫枡浣嶆娴�Tag tag)
         {
             Console.WriteLine($"Thread涓嬫枡浣嶆娴�   =====>");
+            var lsi = new List<string>();
             foreach (var ssx in new string[] { "1003", "1005", "1011", "1013" })
             {
                 var RArrive = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}"), typeof(System.UInt16));
-                var RArriveLast = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}_LAST"), typeof(System.UInt16));
-                if (RArrive == 1 && RArriveLast == 0)
+                //var RArriveLast = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}_LAST"), typeof(System.UInt16));
+                var wArriveOver = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.wArrive{ssx}Over"), typeof(System.UInt16));
+                var rReleaseOver = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.rRelease{ssx}Over"), typeof(System.UInt16));
+                var WRelease = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.WRelease{ssx}"), typeof(System.UInt16));
+                var RtrayCode = (System.String)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"SSX1003051113.R{ssx}Barcode"), typeof(System.String));
+                var rdisTcode = RedisHelper.Get<string>($"Arrive{ssx}BarcodeLast", out string msg);
+                // 鍐欎簡绌烘鍒颁綅鐨勬墭鐩樺彿璁板綍锛�濡傛灉涓嬫淇″彿鏉ヤ簡锛屾墭鐩樺彿涓嶄竴鑷村氨鍐欙紝涓�嚧灏变笉鍐欙紝闃叉鍥犵壒娈婂師鍥犺娓呴櫎閲嶆柊瑙﹀彂锛屽鑷村彂閫侀噸澶嶇殑闂銆�+                LogHelper.Info($@" 鎵樼洏鍙凤細{RtrayCode} redis鎵樼洏鍙凤細{rdisTcode} 绌哄埌浣�RArrive{ssx}>{RArrive} 鏈烘鎵嬫敹鍒版帶鍒颁綅.wArrive{ssx}Over>{wArriveOver} 閫佸嚭瀹屾垚.rRelease{ssx}Over>{rReleaseOver}  鏀捐揣瀹屾垚.WRelease{ssx}>{WRelease}");
+                if (RArrive == 1 && WRelease == 0 /*&& RArriveLast == 0*/ && !string.IsNullOrEmpty(RtrayCode) && RtrayCode != rdisTcode)
                 {
-                    if (ssx == "1005" && tag.SF涓嬫枡浣�WRelease1005 == 0)
+                    switch (ssx)
                     {
-                        tag.FNK1.D2215 = 1;
-                        //tag.SF涓嬫枡浣�RArrive1005_LAST = 1;
-                        RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "1", out string msg);
-
-                        //tag.SF涓嬫枡浣�WRelease1005 = 0;
-                        //tag.SF涓嬫枡浣�WSafe0305 = 0;
+                        case "1003":
+                            {
+                                LogHelper.Info($"ssx == 1003 && tag.SF涓嬫枡浣�WRelease1003:{tag.SF涓嬫枡浣�WRelease1003}  鍐檉1 2210=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+                                tag.FNK1.D2210 = 1;
+                                //Conn.榛樿Redis.SetValue($"p鍙戦偅绉�涓嬬嚎.D2210", "1", $"p鍙戦偅绉�涓嬬嚎Queue",false);
+                            }
+                            break;
+                        case "1005":
+                            {
+                                LogHelper.Info($"ssx == 1005 && tag.SF涓嬫枡浣�WRelease1005:{tag.SF涓嬫枡浣�WRelease1005}  鍐檉1 2215=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+                                tag.FNK1.D2215 = 1;
+                            }
+                            break;
+                        case "1011":
+                            {
+                                LogHelper.Info($"ssx == 1011 && tag.SF涓嬫枡浣�WRelease1011:{tag.SF涓嬫枡浣�WRelease1011}  鍐檉2 2210=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+                                tag.FNK2.D2210 = 1;
+                            }
+                            break;
+                        case "1013":
+                            {
+                                LogHelper.Info($"ssx == 1013 && tag.SF涓嬫枡浣�WRelease1013:{tag.SF涓嬫枡浣�WRelease1013}  鍐檉2 2215=1锛孉rrive{ssx}BarcodeLast={RtrayCode}");
+                                tag.FNK2.D2215 = 1;
+                            }
+                            break;
                     }
-                    else if (ssx == "1003" && tag.SF涓嬫枡浣�WRelease1003 == 0)
-                    {
-                        tag.FNK1.D2210 = 1;
-                        //tag.SF涓嬫枡浣�RArrive1003_LAST = 1;
-
-                        RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "1", out string msg);
-
-                        //tag.SF涓嬫枡浣�WRelease1003 = 0;
-                        //tag.SF涓嬫枡浣�WSafe0305 = 0;
-                    }
-                    else if (ssx == "1013" && tag.SF涓嬫枡浣�WRelease1013 == 0)
-                    {
-                        tag.FNK2.D2215 = 1;
-                        //tag.SF涓嬫枡浣�RArrive1013_LAST = 1;
-                        RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "1", out string msg);
-
-                        //tag.SF涓嬫枡浣�WRelease1013 = 0;
-                        //tag.SF涓嬫枡浣�WSafe1113 = 0;
-                    }
-                    else if (ssx == "1011" && tag.SF涓嬫枡浣�WRelease1011 == 0)
-                    {
-                        tag.FNK2.D2210 = 1;
-                        //tag.SF涓嬫枡浣�RArrive1011_LAST = 1;
-                        RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "1", out string msg);
-
-                        //tag.SF涓嬫枡浣�WRelease1011 = 0;
-                        //tag.SF涓嬫枡浣�WSafe1113 = 0;
-                    }
+                    RedisHelper.Add($"Arrive{ssx}BarcodeLast", RtrayCode, out msg);
                 }
-                else if (RArrive == 0 && RArriveLast == 1)
+                else if (RArrive == 0)
                 {
-                    RedisHelper.Add($"FNK1003051113.RArrive{ssx}_LAST", "0", out string msg);
+                    //if (RArriveLast == 1)
+                    //{
+                    //    LogHelper.Info($"閲嶇疆 FNK1003051113.RArrive{ssx}_LAST=0");
+                    //    RedisHelper.Add($"FNK1003051113.RArrive{ssx}_LAST", "0", out string msg);
+                    //}
+                    if (wArriveOver == 1)
+                    {
+                        LogHelper.Info($"閲嶇疆 FNK1003051113.wArrive{ssx}Over=0");
+                        Conn.榛樿Redis.SetValue($"FNK1003051113.wArrive{ssx}Over", "0", $"FNK1003051113Queue");
+                    }
                     //Conn.榛樿Redis.SetValue($"FNK1003051113.RArrive{ssx}_LAST", "0", $"FNK1003051113Queue");
                 }
+
+                if (WRelease == 1 && rReleaseOver == 1)
+                {
+                    //switch (ssx)
+                    //{
+                    //    case "1003":
+                    //        {
+                    //            LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1  璇籉NK1.D2213{tag.FNK1.D2213}=1? 骞跺啓0");
+                    //            tag.FNK1.D2213 = 0;
+                    //        }
+                    //        break;
+                    //    case "1005":
+                    //        {
+                    //            LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1  璇籉NK1.D2218{tag.FNK1.D2218}=1? 骞跺啓0");
+                    //            tag.FNK1.D2218 = 0;
+                    //        }
+                    //        break;
+                    //    case "1011":
+                    //        {
+                    //            LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1  璇籉NK2.D2213{tag.FNK1.D2213}=1? 骞跺啓0");
+                    //            tag.FNK2.D2213 = 0;
+                    //        }
+                    //        break;
+                    //    case "1013":
+                    //        {
+                    //            LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1  璇籉NK2.D2218{tag.FNK2.D2218}=1?  骞跺啓0");
+                    //            tag.FNK2.D2218 = 0;
+                    //        }
+                    //        break;
+                    //}
+                    LogHelper.Info($"璇粄ssx} WRelease=1&& rReleaseOver=1  WRelease 鍐�");
+                    Conn.榛樿Redis.SetValue($"FNK1003051113.WRelease{ssx}", "0", $"FNK1003051113Queue");
+                }
+
             }
         }
 
         public void ThreadFNK1Over(Tag tag)
         {
             Console.WriteLine($"ThreadFNK1Over    =====>");
+            LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
+            //LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2215=0锛孌2217_LAST=1锛學Release1005=1 RArrive1005_LAST=0");
             if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
             {
-                tag.FNK1.D2215 = 0;
+                //tag.FNK1.D2215 = 0;
+                //tag.FNK1.D2218 = 1;
                 //tag.FNK1.D2212_LAST = 1;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
 
                 tag.SF涓嬫枡浣�WRelease1005 = 1;
                 tag.SF涓嬫枡浣�WSafe0305 = 1;
                 System.Threading.Thread.Sleep(1000);
-                RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "0", out msg);
+                //RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "0", out msg);
+                RedisHelper.Add($"Arrive1005BarcodeLast", "0", out msg);
+                LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2218=1锛孌2217_LAST=1锛學Release1005=1 Arrive1005BarcodeLast=0");
             }
-            if (tag.FNK1.D2216 == 1)
-                tag.FNK1.D2215 = 0;
             else if (tag.FNK1.D2217 == 0 && tag.FNK1.D2217_LAST == 1)
+            {
                 //tag.FNK1.D2217_LAST = 0;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "0", out string msg);
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎.D2217_LAST=0");
+            }
+            if (tag.FNK1.D2216 == 1)
+            {
+                tag.FNK1.D2215 = 0;
+                tag.SF涓嬫枡浣�wArrive1005Over = 1;
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1  鍐橠2215 =0锛�鍐欐満姊版墜鏀跺埌1005 =1");
+            }
 
+            LogHelper.Info($" FN1 D2212>{tag.FNK1.D2212} D2212LAST>{tag.FNK1.D2212_LAST} D2210>{tag.FNK1.D2210} D2211>{tag.FNK1.D2211} D2213>{tag.FNK1.D2213}");
             if (tag.FNK1.D2212 == 1 && tag.FNK1.D2212_LAST == 0)
             {
-                tag.FNK1.D2210 = 0;
+                //tag.FNK1.D2213 = 1;
+                //tag.FNK1.D2210 = 0;
                 //tag.FNK1.D2217_LAST = 1;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
                 tag.SF涓嬫枡浣�WRelease1003 = 1;
                 tag.SF涓嬫枡浣�WSafe0305 = 1;
                 System.Threading.Thread.Sleep(1000);
-                RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "0", out msg);
+                //RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "0", out msg);
+                RedisHelper.Add($"Arrive1003BarcodeLast", "0", out msg);
+                LogHelper.Info($" FN1 .D2212=1,2212_LAST=0 鍐�D2213=1锛孌2212_LAST=1锛學Release1003=1 Arrive1003BarcodeLast=0");
             }
             //else if (tag.FNK1.D2211 == 1)
             //    tag.FNK1.D2210 = 0;
@@ -1278,79 +1988,1660 @@
             {
                 //tag.FNK1.D2212_LAST = 0;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "0", out string msg);
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎.D2212_LAST=0");
             }
-            if (tag.FNK1.D2211 == 1)
-                tag.FNK1.D2210 = 0;
 
+            if (tag.FNK1.D2211 == 1)
+            {
+                tag.FNK1.D2210 = 0;
+                tag.SF涓嬫枡浣�wArrive1003Over = 1;
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1  鍐橠2210 =0 鍐欐満姊版墜鏀跺埌绌哄埌1003=1");
+            }
         }
+
         public void ThreadFNK2Over(Tag tag)
         {
             Console.WriteLine($"ThreadFNK2Over    =====>");
+            LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2218>{tag.FNK2.D2218}");
             if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
             {
-                tag.FNK2.D2215 = 0;
+                //tag.FNK2.D2215 = 0;
+                //tag.FNK2.D2218 = 1;
                 //tag.FNK2.D2212_LAST = 1;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
 
                 tag.SF涓嬫枡浣�WRelease1013 = 1;
                 tag.SF涓嬫枡浣�WSafe1113 = 1;
                 System.Threading.Thread.Sleep(1000);
-                RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "0", out msg);
+                //RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "0", out msg);
+                RedisHelper.Add($"Arrive1013BarcodeLast", "0", out msg);
+                LogHelper.Info($" FN2 .D2217=1,2217_LAST=0 鍐�2218=1锛孌2217_LAST=1锛學Release1013=1 Arrive1013BarcodeLast=0");
             }
             else if (tag.FNK2.D2217 == 0 && tag.FNK2.D2217_LAST == 1)
+            {
                 //tag.FNK2.D2217_LAST = 0;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "0", out string msg);
 
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎.D2217_LAST=0");
+            }
             if (tag.FNK2.D2216 == 1)
+            {
                 tag.FNK2.D2215 = 0;
+                tag.SF涓嬫枡浣�wArrive1013Over = 1;
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2216=1  鍐橠2215 =0 鍐欐満姊版墜鏀跺埌绌哄埌1013=1");
+            }
 
+            LogHelper.Info($" FN2 D2212>{tag.FNK2.D2212} D2212LAST>{tag.FNK2.D2212_LAST} D2210>{tag.FNK2.D2210} D2211>{tag.FNK2.D2211} D2213>{tag.FNK2.D2213}");
             if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0)
             {
-                tag.FNK2.D2210 = 0;
+                //tag.FNK2.D2210 = 0;
+                //tag.FNK2.D2213 = 1;
                 //tag.FNK2.D2217_LAST = 1;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
 
                 tag.SF涓嬫枡浣�WRelease1011 = 1;
                 tag.SF涓嬫枡浣�WSafe1113 = 1;
                 System.Threading.Thread.Sleep(1000);
-                RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "0", out msg);
+                //RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "0", out msg);
+                RedisHelper.Add($"Arrive1011BarcodeLast", "0", out msg);
+                LogHelper.Info($" FN2 .D2212=1,2212_LAST=0 鍐�2213=1锛孌2212_LAST=1锛學Release1011=1 Arrive1011BarcodeLast=0");
             }
             else if (tag.FNK2.D2212 == 0 && tag.FNK2.D2212_LAST == 1)
             {
                 //tag.FNK2.D2212_LAST = 0;
                 RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "0", out string msg);
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎.D2212_LAST=0");
             }
             if (tag.FNK2.D2211 == 1)
+            {
                 tag.FNK2.D2210 = 0;
-
+                tag.SF涓嬫枡浣�wArrive1011Over = 1;
+                LogHelper.Info($" p鍙戦偅绉�涓嬬嚎 璇籇2211=1  鍐橠2210 =0 鍐欐満姊版墜鏀跺埌绌哄埌1011 wArrive1011Over=1");
+            }
         }
+
 
         public void Thread1019Down(Tag tag)
         {
-            Console.WriteLine($"1019浠诲姟鐘舵�锛�  =====>");
-            Console.WriteLine($"1019浠诲姟鐘舵�锛歿tag.SA1019.RtaskState}- barcode:{tag.SA1019.R鎵樼洏鐮亇- 绌洪棽{tag.SA1019.R5绌洪棽}");
+            var taggg = tag.SA1019;
+            string vqu = "A1019鍙栬揣浜や簰";
+            LogHelper.Info($"1019浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+            }
+            //Console.WriteLine($"1019浠诲姟鐘舵�锛�  =====>");
+            //Console.WriteLine($"1019浠诲姟鐘舵�锛歿tag.SA1019.RtaskState}- barcode:{tag.SA1019.R鎵樼洏鐮亇- 绌洪棽{tag.SA1019.R5绌洪棽}");
         }
+
+        private void sa2008(Tag tag)
+        {
+            var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
+            LogHelper.Info($"2008 鎵樼洏鍙穥tag.SA2030.R鎵樼洏鐮亇  redis Arrive{2008}BarcodeLast鎵樼洏鍙凤細{rdisTcode} 鍖归厤鏍¢獙銆�);
+            if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s2008.R鎵樼洏鐮� && rdisTcode != tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�
+            {
+                var ntr = tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�
+                var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                {
+                    cntrCode = ntr,
+                    type = 1
+                }));
+                var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                if (strr.success && strr.data != null)
+                {
+                    var end = (strr.data.lineNum == 1 ? 2027
+                                : strr.data.lineNum == 2 ? 2020 : 2013);
+                    tag.ssx杈撻�绾�s2008.wTaskNo = (uint)(20080000 + end);
+                    tag.ssx杈撻�绾�s2008.wEbit = 2027;
+                    tag.ssx杈撻�绾�s2008.R鎵樼洏鐮�= ntr;
+                    RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
+                }
+            }
+        }
+
+        private void sa2030(Tag tag)
+        {
+            var taggg = tag.SA2030;
+            string vqu = "A2030鍙栬揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa2001(Tag tag)
+        {
+            var taggg = tag.SA2001;
+            string vqu = "A2001鏀捐揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa1030(Tag tag)
+        {
+            var taggg = tag.SA1030;
+            string vqu = "A1030鍙栬揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "鍐橝GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "鍐橝GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "鍐橝GV鐢宠");
+            }
+        }
+
+        private void sa1025(Tag tag)
+        {
+            var taggg = tag.SA1025;
+            string vqu = "A1025鏀捐揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa1022(Tag tag)
+        {
+            var taggg = tag.SA1022;
+            string vqu = "A1022鏀捐揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa3010(Tag tag)
+        {
+            var taggg = tag.ssx杈撻�绾�s3010;
+            string vqu = "A3010鍙栬揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa3006(Tag tag)
+        {
+            var taggg = tag.ssx杈撻�绾�s3006;
+            string vqu = "A3006鏀捐揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa3005(Tag tag)
+        {
+            var taggg = tag.ssx杈撻�绾�s3005;
+            string vqu = "A3005鍙栬揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
+        private void sa3001(Tag tag)
+        {
+            var taggg = tag.ssx杈撻�绾�s3010;
+            string vqu = "A3001鏀捐揣浜や簰";
+            LogHelper.Info($"{vqu}浠诲姟鐘舵�锛�  =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}");
+            if (taggg.SOver && taggg.SreadAgvover)
+            {
+                SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠");
+                SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠");
+            }
+        }
+
         public void Thread1025Up(Tag tag)
         {
-            Console.WriteLine($"SA1025 浠诲姟鐘舵�锛�  =====>");
-            Console.WriteLine($"SA1025 浠诲姟鐘舵�锛歿tag.SA1025.RtaskState}- 绌洪棽{tag.SA1025.R5绌洪棽}");
+            //if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
+            //{
+            //    SetRedistoPlc("A1019鍙栬揣浜や簰.Ssetreq", "false", "A1019鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+            //    SetRedistoPlc("A1019鍙栬揣浜や簰.SOver", "false", "A1019鍙栬揣浜や簰Queue", "鍐橝GV鐢宠");
+            //}
+            //Console.WriteLine($"SA1025 浠诲姟鐘舵�锛�  =====>");
+            //Console.WriteLine($"SA1025 浠诲姟鐘舵�锛歿tag.SA1025.RtaskState}- 绌洪棽{tag.SA1025.R5绌洪棽}");
         }
         public void Thread1022Up(Tag tag)
         {
-            Console.WriteLine($"SA1022    =====>");
-            Console.WriteLine($"SA1022 浠诲姟鐘舵�锛歿tag.SA1022.RtaskState}- 绌洪棽{tag.SA1022.R5绌洪棽}");
+            //if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
+            //{
+            //    SetRedistoPlc("A1019鍙栬揣浜や簰.Ssetreq", "false", "A1019鍙栬揣浜や簰Queue", "娓呯悊");
+            //    SetRedistoPlc("A1019鍙栬揣浜や簰.SOver", "false", "A1019鍙栬揣浜や簰Queue", "娓呯悊");
+            //}
+            //Console.WriteLine($"SA1022    =====>");
+            //Console.WriteLine($"SA1022 浠诲姟鐘舵�锛歿tag.SA1022.RtaskState}- 绌洪棽{tag.SA1022.R5绌洪棽}");
         }
         public void Thread1030Down(Tag tag)
         {
             Console.WriteLine($"SA1030 浠诲姟鐘舵�锛�  =====>");
-            Console.WriteLine($"SA1030 浠诲姟鐘舵�锛歿tag.SA1030.RtaskState}- 绌洪棽{tag.SA1030.R5绌洪棽}-->瀵瑰簲缁堢偣2001>绌洪棽5锛歿tag.SA2001.R5绌洪棽}");
+            if (tag.SA1030.RtaskState == 4 && tag.SA1030.RtaskState_LAST == 0 && tag.SA2001.R5绌洪棽 == 5)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 10,
+                    startBit = "1030",
+                    endBit = "2001",
+                }));
+                RedisHelper.Add($"S1030Read.RtaskState_LAST", "1", out string msg);
+            }
+            else if (tag.SA1030.RtaskState != 4 && tag.SA1030.RtaskState_LAST == 1)
+                RedisHelper.Add($"S1030Read.RtaskState_LAST", "0", out string msg);
+            //if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
+            //{
+            //    SetRedistoPlc("A1022鏀捐揣浜や簰.Ssetreq", "false", "A1022鏀捐揣浜や簰Queue", "娓呯悊");
+            //    SetRedistoPlc("A1022鏀捐揣浜や簰.SOver", "false", "A1022鏀捐揣浜や簰Queue", "娓呯悊");
+            //}
+            //Console.WriteLine($"SA1030 浠诲姟鐘舵�锛歿tag.SA1030.RtaskState}- 绌洪棽{tag.SA1030.R5绌洪棽}-->瀵瑰簲缁堢偣2001>绌洪棽5锛歿tag.SA2001.R5绌洪棽}");
         }
         public void Thread2030Down(Tag tag)
         {
-            Console.WriteLine($"SA2030 浠诲姟鐘舵�锛�  =====>");
-            Console.WriteLine($"SA2030 浠诲姟鐘舵�锛歿tag.SA2030.RtaskState}- 绌洪棽{tag.SA2030.R5绌洪棽} - barcode:{tag.SA2030.R鎵樼洏鐮亇");
+
+            //Console.WriteLine($"SA2030 浠诲姟鐘舵�锛�  =====>");
+            //Console.WriteLine($"SA2030 浠诲姟鐘舵�锛歿tag.SA2030.RtaskState}- 绌洪棽{tag.SA2030.R5绌洪棽} - barcode:{tag.SA2030.R鎵樼洏鐮亇");
+
+        }
+
+        public void ResolveMesTask(Tag tag)
+        {
+            TaskRepository taskservice = new TaskRepository();
+            var tasks = taskservice.FindList(x => (x.S_B_STATE == "MES" || x.S_B_STATE == "People") && x.N_PRIORITY == -88);
+            var VERXs = Settings.deviceInfos?.FindAll(x => x.deviceType == 2);
+            //if (VERXs.Any())
+            foreach (var task in tasks)
+            {
+                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} ");
+                if (task.S_TYPE?.Trim() == "100")
+                {
+                    LogHelper.Info($"MES浠诲姟 S_TYPE 100->{task.S_TYPE} ");
+                }
+                var sx = VERXs?.Find(x => x.location.Contains(task.S_END_LOC));
+                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} {(sx == null ? "闈� : "鏄�)}鎬昏鏈哄櫒浜轰换鍔�);
+                if (sx == null)
+                {
+                gotoOOOOOOOOO:
+                    if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
+                    {
+                        // 鍙枡浠诲姟銆�鎸囧畾鐗╂枡涓嶆寚瀹氭墭鐩橈紝闇�鍑哄簱
+                        var ssagv = Settings.deviceInfos.Find(x => x.deviceType == 4);
+                        if (ssagv.location.Contains(task.S_START_LOC))
+                            switch (task.S_START_LOC)
+                            {
+                                case "2030":
+                                    if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
+                                    {
+                                        LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 2030 鍑哄彛鎵樼洏鍙穥tag.SA2030.R鎵樼洏鐮亇 鍖归厤鏍¢獙銆�);
+                                        var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                        {
+                                            cntrCode = tag.SA2030.R鎵樼洏鐮�
+                                            type = 1
+                                        }));
+                                        var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                        if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                        {
+                                            task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+                                            taskservice.Update(task);
+                                            goto gotoOOOOOOOOO;
+                                        }
+                                        else
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�2030 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        //2027  2220   2013.. 璇嗗埆涓�笅锛屽紑濮嬪簱
+                                        //1 鐪�7 20 13 鏄惁鏈変换鍔°� 鏈夊垯涓嶅嚭浜嗐� 绛夊嚭鍙e垽鏂尮閰嶃�
+                                        //2  閮芥病鏈変换鍔★紝閫愪釜鍖归厤鏄惁绗﹀悎锛屽垯鍑哄簱銆�+                                        //LogHelper.Info($"");
+                                        {
+                                            var t20132027 = tag.ssx杈撻�绾�s2027;
+                                            LogHelper.Info($"璇嗗埆2027浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
+                                            if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) || (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
+                                            {
+                                                LogHelper.Info($"2027浠诲姟 浠诲姟缁堢偣鏄�030 锛岀粓姝�);
+                                                continue;
+                                            }
+                                        }
+                                        {
+                                            var t20132027 = tag.ssx杈撻�绾�s2020;
+                                            LogHelper.Info($"璇嗗埆2027浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
+                                            if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) || (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
+                                            {
+                                                LogHelper.Info($"2020浠诲姟 浠诲姟缁堢偣鏄�030 锛岀粓姝�);
+                                                continue;
+                                            }
+                                        }
+                                        {
+                                            var t20132027 = tag.ssx杈撻�绾�s2013;
+                                            LogHelper.Info($"璇嗗埆2027浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
+                                            if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) || (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
+                                            {
+                                                LogHelper.Info($"2013浠诲姟 浠诲姟缁堢偣鏄�030 锛岀粓姝�);
+                                                continue;
+                                            }
+                                        }
+                                        if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�)
+                                        {
+                                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                            {
+                                                cntrCode = tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�
+                                                type = 1
+                                            }));
+                                            var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                            if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                            {
+                                                LogHelper.Info($"2027 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2027.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20272030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+                                                tag.ssx杈撻�绾�s2027.wTaskNo = 20272030;
+                                                tag.ssx杈撻�绾�s2027.wEbit = 2030;
+                                                tag.ssx杈撻�绾�s2027.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�
+                                                LogHelper.Info($"2027 > 2030  SSX浠诲姟涓嬪彂瀹屾垚銆�);
+                                                continue;
+                                            }
+                                        }
+                                        if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�)
+                                        {
+                                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                            {
+                                                cntrCode = tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�
+                                                type = 1
+                                            }));
+                                            var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                            if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                            {
+                                                LogHelper.Info($"2020 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2020.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20202030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+                                                tag.ssx杈撻�绾�s2020.wTaskNo = 20202030;
+                                                tag.ssx杈撻�绾�s2020.wEbit = 2030;
+                                                tag.ssx杈撻�绾�s2020.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�
+                                                LogHelper.Info($"2020 > 2030  SSX浠诲姟涓嬪彂瀹屾垚銆�);
+                                                continue;
+                                            }
+                                        }
+                                        if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�)
+                                        {
+                                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                            {
+                                                cntrCode = tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�
+                                                type = 1
+                                            }));
+                                            var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                            if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                            {
+                                                LogHelper.Info($"2013 璇诲埌鎵樼洏{tag.ssx杈撻�绾�s2013.R鎵樼洏鐮亇 鍖归厤鎴愬姛锛屽啓浠诲姟鍙凤細20132030锛岀粓鐐癸細2030 鍜屾墭鐩樼爜鍚岃");
+                                                tag.ssx杈撻�绾�s2013.wTaskNo = 20132030;
+                                                tag.ssx杈撻�绾�s2013.wEbit = 2030;
+                                                tag.ssx杈撻�绾�s2013.w鎵樼洏鐮�= tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�
+                                                LogHelper.Info($"2013 > 2030  SSX浠诲姟涓嬪彂瀹屾垚銆�);
+                                                continue;
+                                            }
+                                        }
+                                        LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鏃ュ織鑳借窇鍒拌繖锛岃鏄庢病鐗╂枡锛屾垨鑰呴兘涓嶇鍚�鏃犳硶鍘�030");
+                                    }
+                                    break;
+                                case "1019":
+                                    if (!string.IsNullOrEmpty(tag.SA1019.R鎵樼洏鐮�)
+                                    {
+                                        var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                        {
+                                            cntrCode = tag.SA1019.R鎵樼洏鐮�
+                                            type = 2
+                                        }));
+                                        var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                        if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                        {
+                                            task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+                                            taskservice.Update(task);
+                                            goto gotoOOOOOOOOO;
+                                        }
+                                        else
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�1019 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
+                                        }
+                                    }
+                                    break;
+                                //case "1030":
+                                //    {
+
+                                //    }
+                                //break;
+                                case "3005":
+                                    {
+                                        if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s3005.R鎵樼洏鐮�)
+                                        {
+                                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                            {
+                                                cntrCode = tag.ssx杈撻�绾�s3005.R鎵樼洏鐮�
+                                                type = 2
+                                            }));
+                                            var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                            if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                            {
+                                                task.S_CNTRS = tag.ssx杈撻�绾�s3005.R鎵樼洏鐮�
+                                                taskservice.Update(task);
+                                                goto gotoOOOOOOOOO;
+                                            }
+                                            else
+                                            {
+                                                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�3010 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
+                                            }
+                                        }
+                                    }
+                                    break;
+                                case "3010":
+                                    {
+                                        if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s3010.R鎵樼洏鐮�)
+                                        {
+                                            var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+                                            {
+                                                cntrCode = tag.ssx杈撻�绾�s3010.R鎵樼洏鐮�
+                                                type = 2
+                                            }));
+                                            var strr = JsonConvert.DeserializeObject<MES2234>(str);
+                                            if (strr.success && strr.data.materialCode == task.S_INDEX)
+                                            {
+                                                task.S_CNTRS = tag.ssx杈撻�绾�s3010.R鎵樼洏鐮�
+                                                taskservice.Update(task);
+                                                goto gotoOOOOOOOOO;
+                                            }
+                                            else
+                                            {
+                                                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�3010 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
+                                            }
+                                        }
+                                    }
+                                    break;
+                            }
+                        //else if (ssagv.location.Contains(task.S_END_LOC))
+                        //    switch (task.S_END_LOC)
+                        //    {
+                        //        case "1022":
+                        //            {
+                        //                if (tag.SA1022.R5绌洪棽 != 1)
+                        //                {
+                        //                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 闈炵┖闂诧紝涓嶆帹閫�);
+                        //                    continue;
+                        //                }
+                        //            }
+                        //            break;
+                        //        case "1025":
+                        //            {
+                        //                if (tag.SA1025.R5绌洪棽 != 1)
+                        //                {
+                        //                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 闈炵┖闂诧紝涓嶆帹閫�);
+                        //                    continue;
+                        //                }
+                        //            }
+                        //            break;
+                        //        case "2001":
+                        //            {
+                        //                if (tag.SA2001.R5绌洪棽 != 1)
+                        //                {
+                        //                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001 闈炵┖闂诧紝涓嶆帹閫�);
+                        //                    continue;
+                        //                }
+                        //            }
+                        //            break;
+                        //        case "3001":
+                        //            {
+                        //                if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 1)
+                        //                {
+                        //                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001 闈炵┖闂诧紝涓嶆帹閫�);
+                        //                    continue;
+                        //                }
+                        //            }
+                        //            break;
+                        //        case "3006":
+                        //            {
+                        //                if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 1)
+                        //                {
+                        //                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006 闈炵┖闂诧紝涓嶆帹閫�);
+                        //                    continue;
+                        //                }
+                        //            }
+                        //            break;
+                        //    }
+                    }
+                    else
+                    {
+                        //if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
+                        //{
+                        //}
+                        //if (new List<string> { "1019"/*, "1030"*/, "2030", "3005", "3010" }.Contains(task.S_START_LOC))  //1030 鏄富鍔ㄧ敵璇凤紝 涓嶇敤鍒ゆ柇銆�+                        //{
+                        //    //鐗╂枡鍖归厤鍒ゆ柇銆傚拰 2030鍒ゆ柇
+                        //}
+                        string type = "";
+                        if (new List<string> { "1019"/*, "1030"*/, "2030", "3005", "3010" }.Contains(task.S_START_LOC))
+                            switch (task.S_START_LOC)
+                            {
+                                case "1019":
+                                    {
+                                        type = "A009";
+                                        if (tag.SA1019.RtaskState != 4)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 1019 RtaskState>{tag.SA1019.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "2030":
+                                    {
+                                        type = "A007";
+                                        if (tag.SA2030.RtaskState != 4)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 2030 RtaskState>{tag.SA2030.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "3005":
+                                    {
+                                        type = "A010";
+                                        if (tag.ssx杈撻�绾�s3005.RtaskState != 4)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3005 RtaskState>{tag.ssx杈撻�绾�s3005.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "3010":
+                                    {
+                                        type = "A010";
+                                        if (tag.ssx杈撻�绾�s3010.RtaskState != 4)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3010 RtaskState>{tag.ssx杈撻�绾�s3010.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                            }
+                        if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
+                            switch (task.S_END_LOC)
+                            {
+                                case "1022":
+                                    {
+                                        type = "A008";
+                                        if (tag.SA1022.R5绌洪棽 != 5)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 >{tag.SA1022.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "1025":
+                                    {
+                                        type = "A007";
+                                        if (tag.SA1025.R5绌洪棽 != 5)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 >{tag.SA1025.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "2001":
+                                    {
+                                        type = "A007";
+                                        if (tag.SA2001.R5绌洪棽 != 5)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001>{tag.SA2001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "3001":
+                                    {
+                                        type = "A010";
+                                        if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 5)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                                case "3006":
+                                    {
+                                        type = "A010";
+                                        if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 5)
+                                        {
+                                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
+                                            continue;
+                                        }
+                                    }
+                                    break;
+                            }
+
+                        LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟");
+                        //鐩存帴鐢熸垚瀵瑰簲浠诲姟銆�+                        var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>(), "AGV", type);
+
+                        LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟 缁撴灉锛歿res}");
+                        if (res)
+                        {
+                            LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 淇敼鏍囪瘑");
+                            //task.N_PRIORITY = 0;
+                            taskservice.dbcontext.Set<TaskEntity>().Attach(task);
+                            taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
+                            taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
+                            taskservice.dbcontext.SaveChanges();
+                        }
+                    }
+                }
+                else
+                {
+                    var sindex = sx.location.ToList().IndexOf(task.S_END_LOC);
+                    LocRepository locRepository = new LocRepository();
+                    //鐢熸垚璺宠穬浠诲姟銆� -- 鎵樼洏璐т綅琛ㄣ� 
+                    var t1s = taskservice.FindList(x => x.S_SRC_NO == task.S_TASK_NO);
+
+                    LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鏌ユ壘鏄惁鏈夊凡鐢熸垚浠诲姟锛歿t1s != null}");
+                    if (t1s.Any())
+                    {
+                        var t1 = t1s.OrderBy(x => x.T_CREATE).LastOrDefault();
+                        if (t1.S_END_LOC == task.S_END_LOC)
+                        {
+                            task.N_PRIORITY = 0;
+                            task.S_B_STATE = "MES_瀹屾垚";
+                            taskservice.Update(task);
+                            continue;
+                        }
+                        if (t1.S_B_STATE == "瀹屾垚")
+                        {
+                            //1.缁堢偣鏄惁鏈夋墭鐩樸� 渚濇嵁鏄粓鐐圭殑浠诲姟鏄�浣滀负缁堢偣锛岃繕鏄捣鐐广�
+                            //var ec = taskservice.FindList(x => (x.S_START_LOC == task.S_START_LOC || x.S_END_LOC == task.S_END_LOC) /*&& DateTime.Now.Subtract(x.T_CREATE).TotalHours < 5*/).OrderByDescending(x => x.T_CREATE).FirstOrDefault();//($"select top 1 * from TN_TASK WHERE S_START_LOC='{task.S_END_LOC}' OR S_END_LOC='{task.S_END_LOC}' ORDER BY T_CREATE DESC");
+                            //var ec = taskservice.FindList(x => x.S_START_LOC == task.S_START_LOC && x.S_END_LOC == task.S_START_LOC, new Common.Data.Pagination
+                            //                        {
+                            //                            page = 1,
+                            //                            sidx = "T_CREATE",
+                            //                            sord = "desc",
+                            //                            rows = 1
+                            //                        }).FirstOrDefault();
+                            //TaskEntity ec = null;
+                            //var dev = Conn.榛樿Redis.GetValue(sx.deviceName + "." + (sindex == 0 ? "D1224" : "D1225"));
+                            //if (dev?.Trim() == "1")
+                            //    ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "瀹屾垚", new Common.Data.Pagination
+                            //    {
+                            //        page = 1,
+                            //        sidx = "T_CREATE",
+                            //        sord = "desc",
+                            //        rows = 1
+                            //    }).FirstOrDefault();
+                            bool canReq = true;
+                            var tf = Conn.榛樿Redis.GetValue(sx.deviceName + ".D1202");
+                            var V = sx.location.ToList().FindIndex(x => x == task.S_END_LOC) == 0;
+                            var tf2 = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
+                            canReq = TcpServer.GetBitdata(tf2, (V ? 2 : 3)) == 1;
+                            //if (canReq)
+                            //    ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "瀹屾垚", new Common.Data.Pagination
+                            //    {
+                            //        page = 1,
+                            //        sidx = "T_CREATE",
+                            //        sord = "desc",
+                            //        rows = 1
+                            //    }).FirstOrDefault();
+                            if (t1.S_START_LOC == task.S_START_LOC && canReq)//!= task.S_END_LOC)
+                            {
+                                //绗簩娈点�
+                                LocEntity endLoc = null;
+                                var di = sx;
+                                if (di != null)
+                                {
+                                    //foreach (var ssloc in di.deviceNo)
+                                    {
+                                        var ssloc = di.deviceNo[1];
+                                        var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
+                                        if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "鏃�)
+                                        {
+                                            endLoc = endloc;
+                                            //break;
+                                        }
+                                    }
+                                    if (endLoc != null)
+                                    {
+                                        var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_END_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "涓嬬┖", 7, "NONE".Split(',').ToList());
+                                        if (res)
+                                        {
+                                            task.N_PRIORITY = 0; taskservice.Update(task);
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (t1.S_START_LOC != task.S_START_LOC)
+                                {
+                                    t1 = taskservice.FindEntity(x => x.S_SRC_NO == task.S_TASK_NO && x.S_START_LOC == task.S_START_LOC && x.S_B_STATE == "瀹屾垚");
+                                }
+                                var res = TaskProcess.CreateTask(task.S_TASK_NO, t1.S_END_LOC, task.S_END_LOC, task.S_TYPE + "琛ユ弧", 6, task.S_CNTRS.Split(',').ToList());
+                                if (res)
+                                {
+                                    task.N_PRIORITY = 0; taskservice.Update(task);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 绛涢�鐢熸垚绗竴娈�浠诲姟銆�);
+                        //鐢熸垚绗竴娈点�
+                        LocEntity endLoc = null;
+                        var di = sx;
+                        if (di != null)
+                        {
+                            //foreach (var ssloc in di.deviceNo)
+                            {
+                                var ssloc = di.deviceNo[0];
+                                var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
+                                if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "鏃�)
+                                {
+                                    endLoc = endloc;
+                                    //break;
+                                }
+                            }
+                            if (endLoc != null)
+                            {
+                                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鍒涘缓绗竴娈�浠诲姟銆�);
+                                var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "婊¤浆", 8, task.S_CNTRS.Split(',').ToList());
+
+                                LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 鍒涘缓绗竴娈�浠诲姟銆傜粨鏋滐細{res}");
+                                if (res)
+                                {
+                                    task.N_PRIORITY = 0; taskservice.Update(task);
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+
+        public string procNo()
+        {
+            return TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�, "LOG");
+        }
+        public bool SetRedistoPlc(string key, string value, string queue, string desc)
+        {
+            var vnc = procNo();
+            LogHelper.Info($"{vnc}>>Redis.SetValue鍐檖lc 鎻忚堪锛歿desc} tagName:{key},value:{value},queue:{queue}");
+            var v = Conn.榛樿Redis.SetValue(key, value, queue);
+            LogHelper.Info($"{vnc}>> 鍐欏叆缁撴灉{v}");
+            return v;
+        }
+        public HkReturnResult OperateHKTaskStatus(HaiKangOrderInfo model)
+        {
+            // 鏌ヨ浠诲姟锛氭牴鎹换鍔″彿
+            //var wcsTask = WCSHelper.GetTask(model.taskCode);
+            ITaskRepository MainMissionService = new TaskRepository();
+            var wcsTask = MainMissionService.FindEntity(x => model.taskCode == x.S_TASK_NO);
+            if (wcsTask != null)
+            {
+                if (!string.IsNullOrWhiteSpace(model.method))
+                {
+                    ILocRepository locrep = new LocRepository();
+                    var startloc = locrep.FindEntity(x => x.S_LOC_CODE == wcsTask.S_START_LOC);
+                    var endLoc = locrep.FindEntity(x => x.S_LOC_CODE == wcsTask.S_END_LOC);
+
+                    List<string> cntrs = wcsTask.S_CNTRS.Split(',').ToList();
+                    bool bobe = false;
+                    //model.method = model.method?.ToLower();
+                    switch (model.method)
+                    {
+                        case "start":
+                            LogHelper.Info($"娴峰悍杞︿换鍔$姸鎬佸彉鏇翠负鎵ц锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+                            if (wcsTask.S_B_STATE.Trim() == "宸叉帹閫�)
+                            {
+                                wcsTask.S_B_STATE = "鎵ц涓�;
+                                wcsTask.T_START_TIME = DateTime.Now;
+                                MainMissionService.Update(wcsTask);
+                                bobe = true;
+                            }
+                            break;
+                        case "outBin":
+                        case "outbin":
+                            model.method = model.method?.ToLower();
+                            LogHelper.Info($"娴峰悍杞︿换鍔$姸鎬佸彉鏇翠负鍙栬揣瀹屾垚锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+                            wcsTask.S_B_STATE = "鍙栬揣瀹屾垚";
+
+                            startloc.N_CURRENT_NUM = 0;
+                            startloc.S_LOCK_STATE = "鏃�;
+                            startloc.T_MODIFY = DateTime.Now;
+                            //ILocContainerRepository locContainerRepository = new LocContainerRepository();
+                            ////var cnr = locContainerRepository.FindList(x => cntrs.Contains(x.S_CNTR_CODE.Trim()) && x.S_LOC_CODE == wcsTask.S_START_LOC);
+                            //locContainerRepository.Delete(x => cntrs.Contains(x.S_CNTR_CODE.Trim()) && x.S_LOC_CODE == wcsTask.S_START_LOC);
+                            MainMissionService.Update(wcsTask);
+                            locrep.Update(startloc);
+
+                            bobe = true;
+                            var device = Settings.deviceInfos.Find(x => x.location.Contains(wcsTask.S_START_LOC));
+                            if (device != null)
+                            {
+                                if (device.deviceType == 1)
+                                {
+                                    if (device.deviceName.Contains("缁村笇灏旀姄鑷�))
+                                    {  //鍗歌揣杩涜娓呯┖锛岃Е鍙戞壂鐮�+                                        var inde = device.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0;
+                                        string V = inde ? "R05" : "R06";
+                                        Conn.榛樿Redis.SetValue(device.deviceName + "." + V, "true", device.deviceName + "Queue", false);
+
+                                        TcpServer.TrayIps.Remove(device.deviceNo[inde ? 0 : 1]);
+                                    }
+                                }
+                                else if (device.deviceType == 2)
+                                {
+                                    //Task.Run(() =>
+                                    //{
+                                    //    var inde = device.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0;
+                                    //    string V = inde ? "D1224" : "D1225";
+                                    //    Conn.榛樿Redis.SetValue(device.deviceName + "." + V, "0", device.deviceName + "Queue");
+                                    //});
+                                }
+                                else
+                                    switch (device.deviceType)
+                                    {
+                                        case 4:
+                                            {
+
+                                            }
+                                            break;
+
+                                    }
+                            }
+                            //LocationHelper.UnLockLoc(wcsTask.S_START_LOC);
+                            break;
+                        case "end":
+                            LogHelper.Info($"娴峰悍杞︿换鍔$姸鎬佸彉鏇翠负瀹屾垚锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+                            wcsTask.S_B_STATE = "瀹屾垚";
+                            wcsTask.T_END_TIME = DateTime.Now;
+
+                            bobe = true;
+                            //ILocContainerRepository locContainerRepository2 = new LocContainerRepository();
+                            //List<LocContainerEntity> llls = new List<LocContainerEntity>();
+                            //foreach (var c in cntrs)
+                            //{
+                            //    var action = new LocContainerEntity()
+                            //    {
+                            //        S_ID = Guid.NewGuid().ToString(),
+                            //        S_STATE = "缂栬緫",
+                            //        T_CREATE = DateTime.Now,
+                            //        T_MODIFY = DateTime.Now,
+
+                            //        S_LOC_CODE = endLoc.S_LOC_CODE,
+                            //        S_CNTR_CODE = c,
+                            //        S_TYPE = "",
+                            //    };
+                            //    llls.Add(action);
+                            //}
+
+                            endLoc.S_LOCK_STATE = "鏃�;
+                            endLoc.N_CURRENT_NUM = 1;
+                            endLoc.T_MODIFY = DateTime.Now;
+                            MainMissionService.Update(wcsTask);
+                            if (Settings.deviceInfos.Find(x => x.deviceType == 2 && (/*x.location.Contains(wcsTask.S_END_LOC)||*/x.deviceNo.Contains(wcsTask.S_END_LOC))) != null)
+                                locrep.Update(endLoc);
+                            //locContainerRepository2.Insert(llls);
+
+                            var device2 = Settings.deviceInfos.Find(x => x.location.Contains(wcsTask.S_END_LOC));
+                            if (device2 != null)
+                            {
+                                if (device2.deviceType == 1)
+                                {
+                                    if (device2.deviceName.Contains("缁村笇灏旀姄鑷�))
+                                    {
+                                        //string V = device2.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0 ? "R10" : "R11";
+                                        //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "true", device2.deviceName + "Queue");
+                                        //鍗歌揣鍐嶅啓鎵樼洏鍙栬蛋銆�鐒跺悗瑙﹀彂鎵爜杩涜鏍¢獙銆�
+                                        var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                        //string V = inde ? "R05" : "R06";
+                                        //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "true", device2.deviceName + "Queue");
+                                        string V2 = inde ? "R10_LAST" : "R11_LAST";
+                                        //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V2, "true", device2.deviceName + "Queue");
+
+                                        GZ.Modular.Redis.RedisHelper.Add(device2.deviceName + "." + V2, "true", out string msg1);
+                                        TcpServer.TrayIps.Remove(device2.deviceNo[inde ? 0 : 1]);
+                                    }
+                                }
+                                else if (device2.deviceType == 2)
+                                {
+                                    if (device2.deviceName.Contains("Js鎹烽『"))
+                                    {
+                                        //Task.Run(() =>
+                                        //{
+                                        var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                        string V = inde ? "D1224" : "D1225";
+                                        Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                        //});
+
+                                        var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
+                                        {
+                                            sceneType = 3,
+                                            cntrCode = cntrs.FirstOrDefault()
+                                        }));
+                                        //if (device2.deviceName.Contains("1"))
+                                        //{
+                                        //    if (inde) tag.Js1.D1224 = 1;
+                                        //    else tag.Js1.D1225 = 1;
+                                        //}else
+                                        //{
+                                        //    if (inde) tag.Js2.D1224 = 1;
+                                        //    else tag.Js2.D1225 = 1;
+                                        //}
+                                    }
+                                    var ssloc = device2.deviceNo[1];
+                                    var endloc = locrep.FindEntity(x => x.S_LOC_CODE == ssloc);
+                                    LogHelper.Info($"鎹烽『鍗歌揣鍚庯紝 鏌ョ湅缂撳瓨浣�{ssloc}-{endloc?.N_CURRENT_NUM}>0? 鍒欑敵璇穖es鎼蛋銆�);
+                                    if (endloc != null && endloc.N_CURRENT_NUM == 1)
+                                    {
+                                        var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                                        {
+                                            requestType = 3,
+                                            startBit = ssloc
+                                        }));
+                                        LogHelper.Info($"{ssloc}鐢宠mes浠诲姟缁撴灉{str}");
+                                    }
+                                }
+                                else
+                                    switch (device2.deviceType)
+                                    {
+                                        case 4:
+                                            {
+
+                                            }
+                                            break;
+                                        case 5:
+                                            {
+                                                var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                                string V = inde ? "D2210" : "D2215";
+                                                Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                            }
+                                            break;
+                                        case 6:
+                                            {
+                                                //var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                                //string V = inde ? "D2210" : "D2215";
+                                                //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                            }
+                                            break;
+                                    }
+                            }
+
+                            //LocationMethod.JudgeLocation(wcsTask);
+                            break;
+                        case "cancel":
+                            LogHelper.Info($"娴峰悍杞︿换鍔$姸鎬佸彉鏇翠负鍙栨秷锛屼换鍔″彿涓猴細{model.taskCode}", "agv鏉弶浜や簰鏃ュ織");
+                            wcsTask.S_B_STATE = "鍙栨秷";
+                            //startloc.S_LOCK_STATE = "鏃�;
+                            //endLoc.S_LOCK_STATE = "鏃�;
+                            MainMissionService.Update(wcsTask);
+                            TaskActRepository taskActRepository = new TaskActRepository();
+                            var tare = taskActRepository.FindList(x => x.S_TASK_NO == wcsTask.S_TASK_NO);
+                            if (tare.Any())
+                            {
+                                if (tare.Find(x => x.S_ACTION_CODE == "outbin") == null)
+                                {
+                                    startloc.S_LOCK_STATE = "鏃�;
+                                    endLoc.S_LOCK_STATE = "鏃�;
+                                    locrep.Update(startloc);
+                                    locrep.Update(endLoc);
+                                }
+                                else if (tare.Find(x => x.S_ACTION_CODE == "end") == null)
+                                {
+                                    endLoc.S_LOCK_STATE = "鏃�;
+                                    locrep.Update(endLoc);
+                                }
+                            }
+
+                            //locrep.Update(startloc);
+                            //locrep.Update(endLoc);
+                            //TaskProcess.OperateStatus(wcsTask, 7);
+                            //WCSHelper.Fail(wcsTask);
+                            break;
+                        case "apply":
+                            // 鍒ゆ柇璇ヤ换鍔$殑鎺ラ┏浣嶆槸鍚︽湁鍏朵粬鍏ュ簱鎴栧嚭搴撲换鍔★紝濡傛灉鏈夛紝鍒欏湪绛変綅绛夊緟锛屽鏋滄病鏈夛紝鍒欏叆
+                            //TaskisOk(wcsTask);
+                            break;
+                    }
+
+                    if (!string.IsNullOrEmpty(wcsTask.S_SRC_NO))
+                    {
+                        var mestask = MainMissionService.FindEntity(x => x.S_TASK_NO == wcsTask.S_SRC_NO);
+                        if (mestask != null && bobe)
+                        {
+                            if (model.method != "end")
+                            {
+                                if (mestask.S_START_LOC == wcsTask.S_START_LOC && mestask.S_B_STATE == "MES")
+                                    Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+                                    {
+                                        reqCode = wcsTask.S_SRC_NO,
+                                        model.method
+                                    }));
+                            }
+                            else
+                            {
+                                if (mestask.S_END_LOC != wcsTask.S_END_LOC)
+                                {
+                                    LogHelper.Info($"{wcsTask.S_SRC_NO}-{wcsTask.S_TASK_NO} 涓�樁娈靛畬鎴愶紝閲嶇疆杩涜浜岄樁娈点�");
+                                    mestask.N_PRIORITY = -88;
+                                    MainMissionService.Update(mestask);
+                                }
+                                else if (mestask.S_B_STATE == "MES")
+                                {
+                                    var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+                                    {
+                                        reqCode = wcsTask.S_SRC_NO,
+                                        model.method
+                                    }));
+                                }
+                            }
+
+                        }
+                        else if (mestask != null && model.method == "cancel")
+                        {
+                            if (mestask.S_B_STATE == "MES")
+                                Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
+                                {
+                                    reqCode = wcsTask.S_SRC_NO,
+                                    model.method
+                                }));
+                            LogHelper.Info($"{wcsTask.S_SRC_NO}-{wcsTask.S_TASK_NO} 涓�樁娈靛彇娑堬紝閲嶇疆鐐癸紝绾跨▼澶勭悊銆�);
+                            mestask.N_PRIORITY = -1;
+                            mestask.S_B_STATE = "MES_鍙栨秷";
+                            MainMissionService.Update(mestask);
+                        }
+                    }
+                    TaskProcess.AddActionRecord(model.taskCode, model.method, model.eqpCode, model.data, wcsTask.S_START_LOC, wcsTask.S_END_LOC);
+                    //璋冪敤绗笁鏂规帴鍙o紙濡傛灉鏈夛級TaskProcess.ReportStatus
+                }
+                else
+                {
+                    // 鏆傛椂璁惧畾涓�
+                    wcsTask.S_B_STATE = "涓婃姤鐘舵�绌�;
+                    //瀹夊叏璇锋眰绛�+                    //TaskProcess.OperateReq(model.taskCode, wcsTask.N_B_STATE, model.eqpCode, model.data);
+                }
+            }
+            else
+            {
+                LogHelper.Info($"褰撳墠浠诲姟鍙蜂换鍔′笉瀛樺湪{model.taskCode} agv鏉弶浜や簰鏃ュ織");
+                return new HkReturnResult { reqCode = model.reqCode, code = 1, message = "杩欎笉鏄垜浠殑浠诲姟銆� };
+            }
+            return new HkReturnResult { reqCode = model.reqCode, code = 0 };
+        }
+
+        public void TaskEverythingRun()
+        {
+            var host = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName());
+            foreach (var ip in host.AddressList)
+            {
+                if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                {
+                    Console.WriteLine($"ip= {ip.ToString()}");
+                    new HttpServer(ip.ToString()).HttpServerRun();
+                    new TcpServer(ip.ToString());
+                    var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync();
+                    //var client = new WebSocketClient($"http://{ip.ToString()}:8809/").ConnectAsync();
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 瀹氬瓙1鍙风嚎銆�+        /// 1.澧炲姞涓嬬嚎閫昏緫銆�  2. 鏈夊彇绛愪俊鍙峰氨鍐欙紝娌′俊鍙峰珣鍐�+        /// </summary>
+        /// <param name="tag"></param>
+        public void ThreadMXC3(Tag tag)
+        {
+            var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("1鍙�));
+            if (VERX == null)
+            {
+                LogHelper.Info("瀹氬瓙1鍙风嚎 deviceType 5 娌℃湁閰嶇疆銆�);
+                return;
+            }
+            LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST}  D2226>{tag.DZ1.D2226}  D2226_LAST>{tag.DZ1.D2226_LAST}");
+            if (tag.DZ1.D2221 == 1 && tag.DZ1.D2221_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[0],
+                    endBit = "1025",
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2221_LAST", "1", out string msg);
+            }
+            else if (tag.DZ1.D2221 == 0 && tag.DZ1.D2221_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙1鍙锋満姊版墜.D2221_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2221_LAST", "0", out string msg);
+
+                string V = 0 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
+
+
+            if (tag.DZ1.D2226 == 1 && tag.DZ1.D2226_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[1],
+                    endBit = "1025",
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2226_LAST", "1", out string msg);
+            }
+            else if (tag.DZ1.D2226 == 0 && tag.DZ1.D2226_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙1鍙锋満姊版墜.D2226_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2226_LAST", "0", out string msg);
+                string V = 1 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
+
+
+        }
+        /// <summary>
+        /// 瀹氬瓙2鍙风嚎銆�+        /// </summary>
+        /// <param name="tag"></param>
+        public void ThreadMXC4(Tag tag)
+        {
+            var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("2鍙�));
+            if (VERX == null)
+            {
+                LogHelper.Info("瀹氬瓙2鍙风嚎 deviceType 5 娌℃湁閰嶇疆銆�);
+                return;
+            }
+            LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST}  D2226>{tag.DZ2.D2226}  D2226_LAST>{tag.DZ2.D2226_LAST}");
+            if (tag.DZ2.D2221 == 1 && tag.DZ2.D2221_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[0],
+                    endBit = "1025",
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2221_LAST", "1", out string msg);
+            }
+            else if (tag.DZ2.D2221 == 0 && tag.DZ2.D2221_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙2鍙锋満姊版墜.D2221_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2221_LAST", "0", out string msg);
+                string V = 0 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
+
+
+            if (tag.DZ2.D2226 == 1 && tag.DZ2.D2226_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[1],
+                    endBit = "1025",
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2226_LAST", "1", out string msg);
+            }
+            else if (tag.DZ2.D2226 == 0 && tag.DZ2.D2226_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙2鍙锋満姊版墜.D2226_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2226_LAST", "0", out string msg);
+                string V = 1 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
+
+        }
+
+    }
+
+
+
+
+    public class HttpServer
+    {
+        System.Net.HttpListener HttpSvcHost = null;
+
+        public static string _listenerPrefix = "";
+        public HttpServer(string ip)
+        {
+            _listenerPrefix = $"http://{ip}:8808/";
+        }
+        public void HttpServerRun()
+        {
+            HttpSvcHost = new System.Net.HttpListener();
+            HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
+            HttpSvcHost.Prefixes.Add(_listenerPrefix);
+            HttpSvcHost.Start();
+            HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
         }
 
 
+        private async void HttpSvcListenerCallback(IAsyncResult ar)
+        {
+            System.Net.HttpListenerContext context = null;
+            var data = DateTime.Now;
+            string apth = "";
+            try
+            {
+                HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
+                context = HttpSvcHost.EndGetContext(ar);
+                System.Net.HttpListenerRequest request = context.Request;
+                System.Net.HttpListenerResponse response = context.Response;
+
+                using (var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8))
+                {
+                    string requestJson = reader.ReadToEnd();
+                    System.Net.HttpStatusCode statusCode = 0;
+                    apth = request.Url.AbsolutePath;
+                    string respstr = HttpSvcListenerCallback_he(request.HttpMethod, request.Url.AbsolutePath, requestJson, out statusCode);
+                    string logContent = "";
+                    logContent += $"\r\n[{request.HttpMethod}]{request.Url.AbsolutePath}";
+                    logContent += $"\r\n[request]{requestJson}";
+                    logContent += $"\r\n[response]{respstr}";
+                    _ = Task.Run(() =>
+                    {
+                        Conn.榛樿鏃ュ織?.Info(logContent);
+                    });
+                    byte[] bytstr = Encoding.UTF8.GetBytes(respstr);
+                    response.StatusCode = (int)statusCode;
+                    response.SendChunked = false;
+                    response.ContentLength64 = bytstr.Length;
+                    //response.OutputStream.Write(bytstr, 0, bytstr.Length);
+                    if (request.Url.AbsolutePath.ToLower().Contains(".js"))
+                        response.ContentType = "application/javascript";
+                    else if (request.Url.AbsolutePath.ToLower().Contains(".svg"))
+                        response.ContentType = "image/svg+xml";
+                    // 寮傛鍐欏叆鍝嶅簲
+                    await response.OutputStream.WriteAsync(bytstr, 0, bytstr.Length);
+                }
+            }
+            catch (Exception ex)
+            {
+                _ = Task.Run(() =>
+                {
+                    Conn.榛樿鏃ュ織.Error(ex.ToString());
+                });
+            }
+            finally
+            {
+                context?.Response.Close();
+                Console.WriteLine(apth + "<<>>" + DateTime.Now.Subtract(data).TotalMilliseconds);
+            }
+        }
+        private System.String HttpSvcListenerCallback_he(System.String method, System.String path, System.String requestJson, out System.Net.HttpStatusCode statusCode)
+        {
+            try
+            {
+                switch (method)
+                {
+                    case "POST":
+                        {
+                            switch (path)
+                            {
+                                case "/agv/agvCallbackService/agvCallback":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+
+                                        LogHelper.Info("ExecuteState Request-haikang锛� + requestJson);
+                                        var model = JsonConvert.DeserializeObject<HaiKangOrderInfo>(requestJson);
+                                        AutoThread.Instance.OperateHKTaskStatus(model);
+                                        return JsonConvert.SerializeObject(new HkReturnResult { reqCode = model.reqCode });
+                                    }
+                                case "/api/Wcs/CreateTask":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+
+                                        LogHelper.Info("/api/Wcs/CreateTask锛� + requestJson);
+                                        var model = JsonConvert.DeserializeObject<ToWMSMES.CreateTask>(requestJson);
+                                        var res = ToWMSMES.CreateTask.CreatemesTask(model);
+                                        return JsonConvert.SerializeObject(res);
+                                    }
+                                case "/api/Wcs/TestRequestTask":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+                                        LogHelper.Info("/api/Wcs/TestRequestTask锛� + requestJson);
+                                        var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", requestJson);
+                                        return str;
+                                    }
+                                case "/api/Wcs/updateStatus":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+                                        LogHelper.Info("/api/Wcs/updateStatus锛� + requestJson);
+                                        var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", requestJson);
+                                        return str;
+                                    }
+                                case "/api/Wcs/toMes":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+
+                                        LogHelper.Info("/api/Wcs/toMes锛� + requestJson);
+                                        var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
+                                        return str;
+                                    }
+                                case "/api/Wcs/CreatePointTask":
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+
+                                        LogHelper.Info("/api/Wcs/CreatepointTask锛� + requestJson);
+                                        var model = JsonConvert.DeserializeObject<ToWMSMES.CreateTask>(requestJson);
+                                        var res = ToWMSMES.CreateTask.CreatePointTask(model);
+                                        return JsonConvert.SerializeObject(res);
+                                    }
+                            }
+                            break;
+                        }
+                    case "GET":
+                        {
+                            switch (path)
+                            {
+                                case var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html|ico|js|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase):
+                                    {
+                                        statusCode = System.Net.HttpStatusCode.OK;
+                                        // 澶嶅埗鍒癱ase 涓�+                                        //var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html|ico|js|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase)
+                                        var filePath = /*Directory.GetCurrentDirectory() + "\\Static" + "\\" + path.Substring(1);*/System.IO.Path.Combine(Directory.GetCurrentDirectory() + "\\Static", path.Substring(1));
+                                        return File.ReadAllText(filePath);
+                                    }
+                            }
+                            break;
+                        }
+                }
+                statusCode = System.Net.HttpStatusCode.NotFound;
+                return "";
+            }
+            catch (Exception ex)
+            {
+                Conn.榛樿鏃ュ織.Error(ex.ToString());
+                statusCode = System.Net.HttpStatusCode.InternalServerError;
+                return "";
+            }
+        }
+    }
+
+    class EnhancedWebSocketServer
+    {
+        private HttpListener _listener;
+        private readonly string _listenerPrefix;
+        private readonly ConcurrentDictionary<Guid, WebSocket> _connections = new ConcurrentDictionary<Guid, WebSocket>();
+        private CancellationTokenSource _cts = new CancellationTokenSource();
+
+        public EnhancedWebSocketServer(string url)
+        {
+            _listenerPrefix = url;
+        }
+
+        public async Task StartAsync()
+        {
+            try
+            {
+                _listener = new HttpListener();
+                _listener.Prefixes.Add(_listenerPrefix);
+                _listener.Start();
+                Console.WriteLine($"WebSocket鏈嶅姟鍣ㄥ凡鍚姩锛岀洃鍚�{_listenerPrefix}");
+                while (!_cts.IsCancellationRequested)
+                {
+                    HttpListenerContext context = await _listener.GetContextAsync();
+                    if (context.Request.IsWebSocketRequest)
+                    {
+                        var wsContext = await context.AcceptWebSocketAsync(null);
+                        var connectionId = Guid.NewGuid();
+                        _connections[connectionId] = wsContext.WebSocket;
+                        _ = HandleConnectionAsync(connectionId, wsContext.WebSocket, _cts.Token);
+                    }
+                    else
+                    {
+                        context.Response.StatusCode = 400;
+                        context.Response.Close();
+                    }
+                }
+            }
+            catch (Exception ex) when (ex is HttpListenerException || ex is ObjectDisposedException)
+            {
+                // 鏈嶅姟鍣ㄥ仠姝㈡椂鐨勬甯稿紓甯�+                Console.WriteLine("鏈嶅姟鍣ㄦ鍦ㄥ仠姝�..");
+            }
+        }
+
+        private async Task HandleConnectionAsync(Guid connectionId, WebSocket webSocket, CancellationToken ct)
+        {
+            var buffer = new byte[1024 * 4];
+            try
+            {
+                while (webSocket.State == WebSocketState.Open && !ct.IsCancellationRequested)
+                {
+                    var result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), ct);
+
+                    if (result.MessageType == WebSocketMessageType.Close)
+                    {
+                        await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "瀹㈡埛绔叧闂繛鎺�, ct);
+                        break;
+                    }
+
+                    string message = System.Text.Encoding.UTF8.GetString(buffer, 0, result.Count);
+                    Console.WriteLine($"杩炴帴 {connectionId} 鏀跺埌娑堟伅: {message}");
+
+                    // 骞挎挱娑堟伅缁欐墍鏈夊鎴风
+                    await BroadcastMessageAsync($"瀹㈡埛绔�{connectionId} 璇� {message}");
+                }
+            }
+            catch (WebSocketException ex)
+            {
+                Console.WriteLine($"杩炴帴 {connectionId} 閿欒: {ex.WebSocketErrorCode} - {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"澶勭悊杩炴帴 {connectionId} 鏃跺嚭閿� {ex.Message}");
+            }
+            finally
+            {
+                _connections.TryRemove(connectionId, out _);
+                webSocket?.Dispose();
+                Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")} 杩炴帴 {connectionId} 宸插叧闂�);
+            }
+        }
+
+        public async Task BroadcastMessageAsync(string message)
+        {
+            var buffer = System.Text.Encoding.UTF8.GetBytes(message);
+            foreach (var connection in _connections)
+            {
+                if (connection.Value.State == WebSocketState.Open)
+                {
+                    try
+                    {
+                        await connection.Value.SendAsync(
+                            new ArraySegment<byte>(buffer),
+                            WebSocketMessageType.Text,
+                            true,
+                            CancellationToken.None);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"骞挎挱娑堟伅鍒拌繛鎺�{connection.Key} 澶辫触: {ex.Message}");
+                    }
+                }
+            }
+        }
+
+        public async Task StopAsync()
+        {
+            _cts.Cancel();
+
+            // 鍏抽棴鎵�湁杩炴帴
+            foreach (var connection in _connections)
+            {
+                try
+                {
+                    if (connection.Value.State == WebSocketState.Open)
+                    {
+                        await connection.Value.CloseAsync(
+                            WebSocketCloseStatus.NormalClosure,
+                            "鏈嶅姟鍣ㄥ叧闂�,
+                            CancellationToken.None);
+                    }
+                    connection.Value.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"鍏抽棴杩炴帴 {connection.Key} 鏃跺嚭閿� {ex.Message}");
+                }
+            }
+
+            _listener?.Stop();
+            _listener?.Close();
+            Console.WriteLine("WebSocket鏈嶅姟鍣ㄥ凡鍋滄");
+        }
+
+    }
+
+    internal class WebSocketClient
+    {
+        private ClientWebSocket _webSocket = new ClientWebSocket();
+        private readonly Uri _serverUri;
+
+        public WebSocketClient(string serverUrl)
+        {
+            _serverUri = new Uri(serverUrl);
+        }
+
+        public async Task ConnectAsync()
+        {
+            try
+            {
+                await _webSocket.ConnectAsync(_serverUri, CancellationToken.None);
+                Console.WriteLine("宸茶繛鎺ュ埌WebSocket鏈嶅姟鍣�);
+
+                // 鍚姩鎺ユ敹娑堟伅浠诲姟
+                _ = ReceiveMessagesAsync();
+
+                // 鍙戦�娴嬭瘯娑堟伅
+                await SendMessageAsync("Hello, Server!");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"杩炴帴澶辫触: {ex.Message}");
+            }
+        }
+
+        private async Task ReceiveMessagesAsync()
+        {
+            var buffer = new byte[1024];
+            try
+            {
+                while (_webSocket.State == WebSocketState.Open)
+                {
+                    var result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+                    if (result.MessageType == WebSocketMessageType.Close)
+                    {
+                        await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
+                        Console.WriteLine("鏈嶅姟鍣ㄥ叧闂簡杩炴帴");
+                        break;
+                    }
+
+                    string message = Encoding.UTF8.GetString(buffer, 0, result.Count);
+                    Console.WriteLine($"鏀跺埌鏈嶅姟鍣ㄦ秷鎭� {message}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"鎺ユ敹娑堟伅鏃跺嚭閿� {ex.Message}");
+            }
+        }
+
+        public async Task SendMessageAsync(string message)
+        {
+            if (_webSocket.State != WebSocketState.Open)
+            {
+                Console.WriteLine("WebSocket鏈繛鎺ワ紝鏃犳硶鍙戦�娑堟伅");
+                return;
+            }
+
+            byte[] buffer = Encoding.UTF8.GetBytes(message);
+            await _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Text, true, CancellationToken.None);
+        }
+
+        public async Task DisconnectAsync()
+        {
+            if (_webSocket.State == WebSocketState.Open)
+            {
+                await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "瀹㈡埛绔叧闂繛鎺�, CancellationToken.None);
+            }
+            _webSocket.Dispose();
+            Console.WriteLine("宸叉柇寮�ebSocket杩炴帴");
+        }
+    }
+
+
+    class Messss
+    {
+        public bool success { get; set; }
+        public Ddata data { get; set; }
+        public object extra { get; set; }
+    }
+    class Mesrespone
+    {
+        public bool success { get; set; }
+        public string msg { get; set; }
+        public object extra { get; set; }
+    }
+
+    class MES2234
+    {
+        public bool success { get; set; }
+        public ML data { get; set; }
+    }
+
+    public class ML
+    {
+        public string materialCode { get; set; }
+        public int lineNum { get; set; }
+    }
+
+    public class Ddata
+    {
+        public string reqCode { get; set; }
+        public int state { get; set; }
+        public string error { get; set; }
     }
 }
+
+#endregion [鑷畾涔夌被-VS][20250623083459471][AutoThread]
\ No newline at end of file

--
Gitblit v1.9.1