6631437483aed3375a69a4942f783516717d7946..3fac3fde950fac3057e5766fa350f20d454b53a0
4 天以前 czw
1
3fac3f 对比 | 目录
4 天以前 czw
1
6fff0e 对比 | 目录
4 天以前 czw
1
1a2661 对比 | 目录
1个文件已修改
140 ■■■■■ 已修改文件
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/AutoThread.cs
@@ -137,35 +137,35 @@
            {
                try
                {
                    foreach (var ip in new List<string> {
                    device1.p发那科1下线.Config.IP,
                    device1.p发那科2下线.Config.IP,
                    device1.D定子1号机械手.Config.IP,
                    device1.D定子2号机械手.Config.IP,
                    device1.Js捷顺1.Config.IP,
                    device1.Js捷顺2.Config.IP,
                    device1.维希尔抓臂1.Config.IP,
                    device1.维希尔抓臂2.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";
                    //    foreach (var ip in new List<string> {
                    //    device1.p发那科1下线.Config.IP,
                    //    device1.p发那科2下线.Config.IP,
                    //    device1.D定子1号机械手.Config.IP,
                    //    device1.D定子2号机械手.Config.IP,
                    //    device1.Js捷顺1.Config.IP,
                    //    device1.Js捷顺2.Config.IP,
                    //    device1.维希尔抓臂1.Config.IP,
                    //    device1.维希尔抓臂2.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;
                        }
                    }
                    //        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)
                {
@@ -777,15 +777,25 @@
                LogHelper.Info($"查看RGV ç”µé‡ï¼šã€{tag.RGV.R当前电量}】 å……电状态:【{tag.RGV.R充电状态}】 æ•…障代码:【{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 æœ‰125命令未执行。 ");
                    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.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No)
                    {
@@ -1589,6 +1599,11 @@
        public void ThreadEdown(Tag tag)
        {
            Console.WriteLine($"ThreadEdown 20 23 = ç©ºä¸‹æ£€æµ‹ =================> ");
            if (tag.RGV.R充电状态 == 1 || tag.RGV.R手动1自动2 == 1 || tag.RGV.RgvrunError > 0)
            {
                LogHelper.Info($"RGV æ‰‹åЍ||故障||充电,空下检测终止。");
                return;
            }
            TaskRepository taskRepository = new TaskRepository();
            foreach (var Bssx in new string[] { "1020", "1023" })
            {
@@ -1695,7 +1710,12 @@
        public void ThreadDdown(Tag tag)
        {
            Console.WriteLine($"ThreadDdown 08 10 ==================> 1026");
            Console.WriteLine($"ThreadDdown 08 16==================> 1026");
            if (tag.RGV.R充电状态 == 1 || tag.RGV.R手动1自动2 == 1 || tag.RGV.RgvrunError > 0)
            {
                LogHelper.Info($"RGV æ‰‹åЍ||故障||充电,08 16 > 1026终止。");
                return;
            }
            TaskRepository taskRepository = new TaskRepository();
            foreach (var Bssx in new string[] { "1008", "1016" })
            {
@@ -1767,6 +1787,11 @@
        public void Thread0210Down(Tag tag)
        {
            Console.WriteLine($"Thread0210Down ==================>");
            if (tag.RGV.R充电状态 == 1 || tag.RGV.R手动1自动2 == 1 || tag.RGV.RgvrunError > 0)
            {
                LogHelper.Info($"RGV æ‰‹åЍ||故障||充电,02 10 > 1017终止。");
                return;
            }
            TaskRepository taskRepository = new TaskRepository();
            foreach (var Bssx in new string[] { "1002", "1010" })
            {
@@ -1851,6 +1876,7 @@
                            {
                                LogHelper.Info($"ssx == 1003 && tag.SF下料位.WRelease1003:{tag.SF下料位.WRelease1003}  å†™f1 2210=1,Arrive{ssx}BarcodeLast={RtrayCode}");
                                tag.FNK1.D2210 = 1;
                                //Conn.默认Redis.SetValue($"p发那科1下线.D2210", "1", $"p发那科1下线Queue",false);
                            }
                            break;
                        case "1005":
@@ -1891,33 +1917,33 @@
                if (WRelease == 1 && rReleaseOver == 1)
                {
                    switch (ssx)
                    {
                        case "1003":
                            {
                                LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK1.D2213{tag.FNK1.D2213}=1? å¹¶å†™0");
                                tag.FNK1.D2213 = 0;
                            }
                            break;
                        case "1005":
                            {
                                LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK1.D2218{tag.FNK1.D2218}=1? å¹¶å†™0");
                                tag.FNK1.D2218 = 0;
                            }
                            break;
                        case "1011":
                            {
                                LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK2.D2213{tag.FNK1.D2213}=1? å¹¶å†™0");
                                tag.FNK2.D2213 = 0;
                            }
                            break;
                        case "1013":
                            {
                                LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK2.D2218{tag.FNK2.D2218}=1?  å¹¶å†™0");
                                tag.FNK2.D2218 = 0;
                            }
                            break;
                    }
                    //switch (ssx)
                    //{
                    //    case "1003":
                    //        {
                    //            LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK1.D2213{tag.FNK1.D2213}=1? å¹¶å†™0");
                    //            tag.FNK1.D2213 = 0;
                    //        }
                    //        break;
                    //    case "1005":
                    //        {
                    //            LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK1.D2218{tag.FNK1.D2218}=1? å¹¶å†™0");
                    //            tag.FNK1.D2218 = 0;
                    //        }
                    //        break;
                    //    case "1011":
                    //        {
                    //            LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK2.D2213{tag.FNK1.D2213}=1? å¹¶å†™0");
                    //            tag.FNK2.D2213 = 0;
                    //        }
                    //        break;
                    //    case "1013":
                    //        {
                    //            LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  è¯»FNK2.D2218{tag.FNK2.D2218}=1?  å¹¶å†™0");
                    //            tag.FNK2.D2218 = 0;
                    //        }
                    //        break;
                    //}
                    LogHelper.Info($"读{ssx} WRelease=1&& rReleaseOver=1  WRelease å†™0");
                    Conn.默认Redis.SetValue($"FNK1003051113.WRelease{ssx}", "0", $"FNK1003051113Queue");
                }