From b447a2b0dafdaf7e460ca4a73727c81fe820a1ff Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 19 六月 2025 18:51:29 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 52 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
index 723b294..42a03ab 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
@@ -29,6 +29,7 @@
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Entity.OIDATABASE;
using GZ.Modular.Redis;
+using System.Security.Cryptography;
namespace GZ.Projects.AuxAllWCS
{
/// <summary>
@@ -78,15 +79,26 @@
try
{
#region [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
- if (Tag.Global.SettingsOver == 0)
- {
- SettingInit();
- Tag.Global.SettingsOver = 1;
- }
- else if (Settings.deviceInfos.Count == 0)
- {
- Tag.Global.SettingsOver = 0;
- }
+ //LogHelper.Info("1111 +" + DateTime.Now);
+ //((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), null);
+ //LogHelper.Info("2222 +" + DateTime.Now);
+ //((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), new object[] { });
+ //LogHelper.Info("3333 +" + DateTime.Now);
+ Action myDelegate = () => SettingInit();
+ AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", new object[] { tag, myDelegate });
+ //LogHelper.Info("4444 +" + DateTime.Now);
+ //AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", null);
+ //LogHelper.Info("4444 +" + DateTime.Now);
+
+ //if (Tag.Global.SettingsOver == 0)
+ //{
+ // SettingInit();
+ // Tag.Global.SettingsOver = 1;
+ //}
+ //else if (Settings.deviceInfos.Count == 0)
+ //{
+ // Tag.Global.SettingsOver = 0;
+ //}
#endregion [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
}
@@ -691,6 +703,32 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
+
+ System.Threading.Tasks.Task.Factory.StartNew(() =>
+ {
+ System.Threading.Thread.CurrentThread.IsBackground = true;
+ ExitJudgeStack.Push(0);
+ //涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠�+ while (true)
+ {
+ if (IsExitApp) { break; }
+ try
+ {
+ #region [鑴氭湰][20250610002647095][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
+ LogHelper.Info($"娴嬭瘯绾跨▼杩愯鐘舵�鏃ュ織銆嬨�銆嬨�銆�);
+ #endregion [鑴氭湰][20250610002647095][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ }
+ finally
+ {
+ System.Threading.Thread.Sleep(3000);
+ }
+ }
+ ExitJudgeStack.TryPop(out int exitJudgeVal);
+ });
/// <summary>
/// 绋嬪簭鐗囨:浠诲姟涓嬪彂
/// 鎻忚堪:
@@ -702,43 +740,58 @@
//涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠� while (true)
{
- if (IsExitApp) { break; }
+ //if (IsExitApp) { break; }
+ LogHelper.Info("浠诲姟涓嬪彂 while 杩涘叆");
try
{
+ LogHelper.Info("浠诲姟涓嬪彂 try 1 杩涘叆");
#region [鑴氭湰][20250325085542733][涓氬姟閫昏緫.浠诲姟涓嬪彂]
+
ITaskRepository taskservice = new TaskRepository();
- var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "AGV");
- if (tklist.Any())
- foreach (var tk in tklist.GroupBy(item =>
- {
- var ticks = item.T_CREATE.Ticks;
- return new DateTime(ticks - ticks % (10 * TimeSpan.TicksPerMinute));
- }).OrderBy(x => x.Key))
- {
- var ts = tk.OrderByDescending(x => x.N_PRIORITY).ToList();
- foreach (var t in ts)
- {
- var b = false;
- b = RunTask(t);
-
- if (b)
- {
- t.S_B_STATE = "宸叉帹閫�;
- taskservice.Update(t);
- }
- }
- break;
- }
- //foreach (var tk in tklist.GroupBy(item =>
- //{
- // var ticks = item.T_CREATE.Ticks;
- // return new DateTime(ticks - ticks % (10 * TimeSpan.TicksPerMinute));
- //}).OrderBy(x => x.Key))
- //if (tklist.Any())
- //{
-
try
{
+ LogHelper.Info("浠诲姟涓嬪彂 ARG 浠诲姟 杩涘叆");
+ #region AGV浠诲姟涓嬪彂銆�+
+ var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "AGV");
+ if (tklist.Any())
+ foreach (var tk in tklist.GroupBy(item =>
+ {
+ var ticks = item.T_CREATE.Ticks;
+ return new DateTime(ticks - ticks % (10 * TimeSpan.TicksPerMinute));
+ }).OrderBy(x => x.Key))
+ {
+ var ts = tk.OrderByDescending(x => x.N_PRIORITY).ToList();
+ foreach (var t in ts)
+ {
+ var b = false;
+ b = RunTask(t);
+
+ if (b)
+ {
+ t.S_B_STATE = "宸叉帹閫�;
+ taskservice.Update(t);
+ }
+ }
+ break;
+ }
+ //foreach (var tk in tklist.GroupBy(item =>
+ //{
+ // var ticks = item.T_CREATE.Ticks;
+ // return new DateTime(ticks - ticks % (10 * TimeSpan.TicksPerMinute));
+ //}).OrderBy(x => x.Key))
+ //if (tklist.Any())
+ //{
+
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info(ex.Message + ex.StackTrace);
+ }
+ try
+ {
+ LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
#region Rgv
LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠ｇ爜锛氥�{tag.RGV.RgvrunError}銆�);
@@ -862,7 +915,7 @@
}
///1 鏈夎揣 灏� 鍙栥� 1 娌¤揣 灏� 鍗歌揣锛�閮芥湁璐� 灏�鍗歌揣銆�閮芥病璐�灏�鍗�- tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
+ var tklist = 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 鏈変换鍔°�
@@ -873,8 +926,14 @@
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);
- tag.RGV.taskend = 125;
+ LogHelper.Info($"{task1.S_TASK_NO}> end 鍐�125");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
else //1鏈変换鍔� 2 娌′换鍔°�
{
@@ -899,8 +958,10 @@
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);
- tag.RGV.taskend = 125;
+ LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
}
else if (RightSide.Contains(task1.S_START_LOC))
@@ -918,8 +979,10 @@
taskservice.Update(t2);
creT2 = true;
System.Threading.Thread.Sleep(750);
+ LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�125");
RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
- tag.RGV.taskend = 125;
+ LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
}
//else //1 鐩存帴鍗歌揣銆�
@@ -931,8 +994,10 @@
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);
+ LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
- tag.RGV.taskend = 125;
+ LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�0");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
}
}
@@ -947,8 +1012,11 @@
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);
- tag.RGV.taskend = 125;
+ //tag.RGV.taskend = 125;
+ LogHelper.Info($"{task2.S_TASK_NO}> taskend 鍐�25");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
else //1mei 浠诲姟 2 娌′换鍔°�
{
@@ -970,22 +1038,25 @@
tag.RGV.taskno1 = tno;
LogHelper.Info($"{e1017first.S_TASK_NO}>寮�鍐欏叆 task1do>>{e1017first.S_START_LOC}銆�);
tag.RGV.task1do = Convert.ToUInt16(e1017first.S_START_LOC);
- LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 125");
+ 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);
- tag.RGV.taskend = 125;
+ LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
+ //tag.RGV.taskend=125
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+
}
}
}
-
+ LogHelper.Info($"rgv 澶勭悊瀹屾垚銆倀askend 125");
#endregion
}
catch (Exception ex)
{
- LogHelper.Error(ex.Message, ex);
- //throw ex;
+ LogHelper.Info(ex.Message + ex.StackTrace);
}
#endregion [鑴氭湰][20250325085542733][涓氬姟閫昏緫.浠诲姟涓嬪彂]
}
@@ -1260,6 +1331,17 @@
}
System.Threading.Thread.Sleep(2000);
}
+
+ foreach (var item in new string[] { "1004", "1012", "1006", "1014", "1026", "1017" })
+ {
+ var R5 = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{item}Read.R5绌洪棽"), typeof(System.UInt16));
+ var R5绌洪棽_LAST = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{item}Read.R5绌洪棽_LAST"), typeof(System.UInt16));
+ if (R5 != 5 && R5绌洪棽_LAST == 1)
+ {
+ RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "0", out string msg);
+ //Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "0", $"S{item}ReadQueue");
+ }
+ }
#endregion [鑴氭湰][20250616094224396][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1020绌烘涓嬬嚎]
}
catch (Exception ex)
@@ -1462,7 +1544,7 @@
}
else if (ssx == "1003")
{
- tag.FNK2.D2210 = 1;
+ tag.FNK1.D2210 = 1;
//tag.SF涓嬫枡浣�RArrive1003_LAST = 1;
RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "1", out string msg);
--
Gitblit v1.9.1