From 1a2661354c80b098d81df3fe37e6b1d95aa0bac6 Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期一, 14 七月 2025 10:37:48 +0800 Subject: [PATCH] 1 --- 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 270 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 176 insertions(+), 94 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 8845f98..968a572 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" @@ -146,14 +146,25 @@ device1.Js鎹烽『2.Config.IP, device1.缁村笇灏旀姄鑷�.Config.IP, device1.缁村笇灏旀姄鑷�.Config.IP, - device1.RGV.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) - IsMachineOnline(matches.Value); + { + var b = IsMachineOnline(matches.Value); + if (!Iponlines.ContainsKey(ip)) + { + Iponlines.TryAdd(ip, b); + } + else + Iponlines[ip] = b; + } } } catch (Exception ex) @@ -177,12 +188,10 @@ 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 @@ -468,7 +477,7 @@ if (VERX != null) { if (tag.wxr1.R46) - LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R46} R44LAST>{tag.wxr1.R46_LAST} R10>{tag.wxr1.R11}"); + 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) && !string.IsNullOrEmpty(traycode.Trim())) @@ -633,7 +642,7 @@ if (VERX != null) { if (tag.wxr2.R46) - LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R46} R44LAST>{tag.wxr2.R46_LAST} R10>{tag.wxr2.R11}"); + 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) && !string.IsNullOrEmpty(traycode.Trim())) @@ -655,7 +664,7 @@ } else { - TcpServer.TcpServerSend(VERX.deviceNo[2], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); + TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); } } else @@ -773,11 +782,11 @@ 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鍛戒护鏈墽琛屻� "); - 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) { LogHelper.Info($"RGV125鍛戒护鏈墽琛�tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No 鑷姩娓呴櫎125"); @@ -916,9 +925,22 @@ // 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) + { + 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 鏈変换鍔°� @@ -1290,7 +1312,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A1019鍙栬揣浜や簰.Ssetreq", "true", "A1019鍙栬揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA1019.StaskMode = 1; + } } break; case "1030": @@ -1301,7 +1326,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A1030鍙栬揣浜や簰.Ssetreq", "true", "A1030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA1030.StaskMode = 1; + } } break; case "2030": @@ -1312,7 +1340,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A2030鍙栬揣浜や簰.Ssetreq", "true", "A2030鍙栬揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA2030.StaskMode = 1; + } } break; case "3005": @@ -1323,7 +1354,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A3005鍙栬揣浜や簰.Ssetreq", "true", "A3005鍙栬揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.ssx杈撻�绾�s3005.StaskMode = 1; + } } break; case "3010": @@ -1334,7 +1368,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A3010鍙栬揣浜や簰.Ssetreq", "true", "A3010鍙栬揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.ssx杈撻�绾�s3010.StaskMode = 1; + } } break; //} @@ -1348,7 +1385,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A1022鏀捐揣浜や簰.Ssetreq", "true", "A1022鏀捐揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA1022.StaskMode = 2; + } } break; case "1025": @@ -1359,7 +1399,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A1025鏀捐揣浜や簰.Ssetreq", "true", "A1025鏀捐揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA1025.StaskMode = 2; + } } break; case "2001": @@ -1370,7 +1413,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A2001鏀捐揣浜や簰.Ssetreq", "true", "A2001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.SA2001.StaskMode = 2; + } } break; case "3001": @@ -1381,7 +1427,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A3001鏀捐揣浜や簰.Ssetreq", "true", "A3001鏀捐揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.ssx杈撻�绾�s3001.StaskMode = 2; + } } break; case "3006": @@ -1392,7 +1441,10 @@ continuuuuu = true; } else + { SetRedistoPlc("A3006鏀捐揣浜や簰.Ssetreq", "true", "A3006鏀捐揣浜や簰Queue", "鍐橝GV鐢宠"); + tag.ssx杈撻�绾�s3006.StaskMode = 2; + } } break; } @@ -1440,7 +1492,7 @@ { var close = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16)); - if (close == 1) + if (close == 0) { LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�); continuuuuu = true; @@ -1510,18 +1562,22 @@ //涓�嚎鍦板潃锛�0.221.55.181 绔彛锛�000 //if (IsMachineOnline("10.221.55.181")) { - //if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1) - // tag.DZ1.D2211 = 0; - //if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1) - // tag.DZ1.D2216 = 0; + 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; - //if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1) - // tag.DZ2.D2216 = 0; + 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鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> "); @@ -1795,6 +1851,7 @@ { 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": @@ -1835,33 +1892,33 @@ 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; - } + //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"); } @@ -1877,7 +1934,7 @@ if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0) { //tag.FNK1.D2215 = 0; - tag.FNK1.D2218 = 1; + //tag.FNK1.D2218 = 1; //tag.FNK1.D2212_LAST = 1; RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg); @@ -1904,7 +1961,7 @@ 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.D2213 = 1; + //tag.FNK1.D2213 = 1; //tag.FNK1.D2210 = 0; //tag.FNK1.D2217_LAST = 1; RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg); @@ -1939,7 +1996,7 @@ if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0) { //tag.FNK2.D2215 = 0; - tag.FNK2.D2218 = 1; + //tag.FNK2.D2218 = 1; //tag.FNK2.D2212_LAST = 1; RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg); @@ -1968,7 +2025,7 @@ if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0) { //tag.FNK2.D2210 = 0; - tag.FNK2.D2213 = 1; + //tag.FNK2.D2213 = 1; //tag.FNK2.D2217_LAST = 1; RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg); @@ -1998,8 +2055,8 @@ { var taggg = tag.SA1019; string vqu = "A1019鍙栬揣浜や簰"; - Console.WriteLine($"1019浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); - if (taggg.SOver && taggg.SreadSsxOver) + 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鐢宠"); @@ -2037,11 +2094,12 @@ { var taggg = tag.SA2030; string vqu = "A2030鍙栬揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); - if (taggg.SOver && taggg.SreadSsxOver) + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2049,11 +2107,12 @@ { var taggg = tag.SA2001; string vqu = "A2001鏀捐揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); - if (taggg.SOver && taggg.SreadSsxOver) + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2061,11 +2120,12 @@ { var taggg = tag.SA1030; string vqu = "A1030鍙栬揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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鐢宠"); } } @@ -2073,11 +2133,12 @@ { var taggg = tag.SA1025; string vqu = "A1025鏀捐揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2085,11 +2146,12 @@ { var taggg = tag.SA1022; string vqu = "A1022鏀捐揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2097,11 +2159,12 @@ { var taggg = tag.ssx杈撻�绾�s3010; string vqu = "A3010鍙栬揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2109,11 +2172,12 @@ { var taggg = tag.ssx杈撻�绾�s3006; string vqu = "A3006鏀捐揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2121,11 +2185,12 @@ { var taggg = tag.ssx杈撻�绾�s3005; string vqu = "A3005鍙栬揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2133,11 +2198,12 @@ { var taggg = tag.ssx杈撻�绾�s3010; string vqu = "A3001鏀捐揣浜や簰"; - Console.WriteLine($"{vqu}浠诲姟鐘舵�锛� =====>浠诲姟鐢宠锛歿taggg.Ssetreq},杈撻�绾垮厑璁革細{taggg.SreadCan} 浠诲姟瀹屾垚锛歿taggg.SOver} 杈撻�绾挎敹鍒板畬鎴愶細{taggg.SreadAgvover}"); + 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 + ".Ssetreq", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "娓匒GV鐢宠"); + SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "娓匒GV鐢宠"); } } @@ -2163,7 +2229,19 @@ } public void Thread1030Down(Tag tag) { - //Console.WriteLine($"SA1030 浠诲姟鐘舵�锛� =====>agv瀹屾垚SOver{tag.SA1030.SOver}"); + Console.WriteLine($"SA1030 浠诲姟鐘舵�锛� =====>"); + 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", "娓呯悊"); @@ -2498,9 +2576,9 @@ case "1022": { type = "A008"; - if (tag.SA1022.R5绌洪棽 != 1) + if (tag.SA1022.R5绌洪棽 != 5) { - LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 闈炵┖闂诧紝涓嶆帹閫�); + LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 >{tag.SA1022.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�); continue; } } @@ -2508,9 +2586,9 @@ case "1025": { type = "A007"; - if (tag.SA1025.R5绌洪棽 != 1) + if (tag.SA1025.R5绌洪棽 != 5) { - LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 闈炵┖闂诧紝涓嶆帹閫�); + LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 >{tag.SA1025.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�); continue; } } @@ -2518,9 +2596,9 @@ case "2001": { type = "A007"; - if (tag.SA2001.R5绌洪棽 != 1) + if (tag.SA2001.R5绌洪棽 != 5) { - LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001 闈炵┖闂诧紝涓嶆帹閫�); + LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001>{tag.SA2001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�); continue; } } @@ -2528,9 +2606,9 @@ case "3001": { type = "A010"; - if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 1) + if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 5) { - LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001 闈炵┖闂诧紝涓嶆帹閫�); + LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�); continue; } } @@ -2538,9 +2616,9 @@ case "3006": { type = "A010"; - if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 1) + if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 5) { - LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006 闈炵┖闂诧紝涓嶆帹閫�); + LogHelper.Info($"瑙i噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�); continue; } } @@ -2549,7 +2627,7 @@ 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>(), type); + 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) @@ -2694,7 +2772,7 @@ public string procNo() { - return TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�); + return TaskProcess.GenerateTaskNo("鏃ュ織娴佹按鍙�, "LOG"); } public bool SetRedistoPlc(string key, string value, string queue, string desc) { @@ -3041,6 +3119,7 @@ { requestType = 7, startBit = VERX.location[0], + endBit = "1025", unLockStartBitOutbin = true })); LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}"); @@ -3064,6 +3143,7 @@ { requestType = 7, startBit = VERX.location[1], + endBit = "1025", unLockStartBitOutbin = true })); LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}"); @@ -3093,13 +3173,14 @@ LogHelper.Info("瀹氬瓙2鍙风嚎 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}"); + 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}"); @@ -3122,6 +3203,7 @@ { requestType = 7, startBit = VERX.location[1], + endBit = "1025", unLockStartBitOutbin = true })); LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}"); -- Gitblit v1.9.1