From 1cd9ee1a2b74a47e48c637482555388e20bb4eab Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 17 七月 2025 11:30:18 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 278 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 167 insertions(+), 111 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 8b6e9c2..bd1b4f7 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"
@@ -137,35 +137,35 @@
{
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";
+ // 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;
- }
- }
+ // 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)
{
@@ -175,7 +175,7 @@
}, tag, device, 3000));
tasks.Add(GetTask(ThreadMXC3, tag, 3000));
tasks.Add(GetTask(ThreadMXC4, tag, 3000));
- tasks.Add(GetTask(ResetGats, tag, 3000));
+ //tasks.Add(GetTask(ResetGats, tag, 3000));
tasks.Add(GetTask(sa1022, tag, 3000));
tasks.Add(GetTask(sa1025, tag, 3000));
@@ -183,10 +183,10 @@
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));
+ //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());
}
@@ -282,6 +282,7 @@
if (VERX != null)
{
+ LogHelper.Info($"{VERX.deviceName}鏃堕棿鎴�{RedisHelper.Get<string>("Js鎹烽『1#Timestamp", out string mg)} D1212>{tag.Js1.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
if (tag.Js1.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 1)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -300,8 +301,9 @@
if (tag.Js1.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 0)
{
//tag.Js1.D1212_LAST = 0;
+ tag.Js1.D1224 = 0;
RedisHelper.Add($"Js鎹烽『1.D1202_LAST", "0", out string msg);
- //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1224", "0", VERX.deviceName + "Queue");
+ //Conn.榛樿Redis.SetValue("Js鎹烽『1.D1224", "0", VERX.deviceName + "Queue");
}
if (tag.Js1.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 1)
@@ -322,8 +324,8 @@
if (tag.Js1.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 0)
{
//tag.Js1.D1213_LAST = 0;
+ tag.Js1.D1225 = 0;
RedisHelper.Add($"Js鎹烽『1.D1203_LAST", "0", out string msg);
- //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1225", "0", VERX.deviceName + "Queue");
}
}
}
@@ -338,6 +340,8 @@
if (VERX != null)
{
+ LogHelper.Info($"{VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("Js鎹烽『2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
+
if (tag.Js2.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 1)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -355,7 +359,7 @@
if (tag.Js2.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 0)
{
//tag.Js2.D1212_LAST = 0;
-
+ tag.Js2.D1224 = 0;
RedisHelper.Add($"Js鎹烽『2.D1202_LAST", "0", out string msg);
}
if (tag.Js2.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 3) == 1)
@@ -376,7 +380,7 @@
if (tag.Js2.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1213, 2) == 0)
{
//tag.Js2.D1213_LAST = 0;
-
+ tag.Js2.D1225 = 0;
RedisHelper.Add($"Js鎹烽『2.D1203_LAST", "0", out string msg);
}
}
@@ -777,15 +781,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鍛戒护鏌ョ湅 Rgv浠诲姟鏁版嵁 鍐�workmode:{tag.RGV.workMod} taskmod{tag.RGV.taskmod} t1No:{tag.RGV.taskno1} t1do:{tag.RGV.task1do} t2No:{tag.RGV.taskno2} t2do:{tag.RGV.task2do} 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)
{
@@ -795,28 +809,28 @@
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}");
+ LogHelper.Info($"浠诲姟涓嬪彂 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)
{
- 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;
+ //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)
{
- 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;
+ //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);
}
@@ -1153,8 +1167,8 @@
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).OrderBy(x => x.T_CREATE).ToList();
- var timeMorhours = requires.FindAll(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours > 1);
+ var requires1 = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE).ToList();
+ var timeMorhours = requires1.FindAll(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours > 1);
if (timeMorhours.Any())
{
foreach (var mor in timeMorhours)
@@ -1163,10 +1177,23 @@
mor.S_REVIEW_COMMENT = "瓒呮椂涓嶅鐞�;
taskActRepository.Update(mor);
}
- requires = requires.Except(timeMorhours).ToList();
+ requires1 = requires1.Except(timeMorhours).ToList();
}
- foreach (var item in requires)
+ foreach (var requires in requires1.GroupBy(x => x.S_TASK_NO))
+ //foreach (var item in requires)
{
+ var rsss = requires.ToList();
+ var item = rsss.OrderBy(x => x.S_ACTION_CODE.Contains("release") ? 0 : 1).LastOrDefault();
+ if (rsss.Count > 1)
+ {
+ rsss.Remove(item);
+ foreach (var mor in rsss)
+ {
+ mor.N_CREATEMETHOD = 3;
+ mor.S_REVIEW_COMMENT = "澶氫綑涓嶅鐞�;
+ taskActRepository.Update(mor);
+ }
+ }
LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE}鍏夋爡澶勭悊 =================> ");
var tin = taskCOdes.IndexOf(item.S_ACTION_CODE);
if (tin == -1)
@@ -1522,6 +1549,7 @@
}
}
System.Threading.Thread.Sleep(3000);
+ //ResetGats(tag);
}
public void ResetGats(Tag tag)
{
@@ -1534,18 +1562,20 @@
//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", false);
- Conn.榛樿Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue", false);
- }
- if (TcpServer.GetBitdata(numm, 1) == 0)
- {
- 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, 0) == 0)
+ //{
+ // Conn.榛樿Redis.SetValue(dev.deviceName + ".D1220", "0", dev.deviceName + "Queue", false);
+ // Conn.榛樿Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue", false);
+ //}
+ //if (TcpServer.GetBitdata(numm, 1) == 0)
+ //{
+ // 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.GetValue(dev.deviceName + ".D1224");
Conn.榛樿Redis.SetValue(dev.deviceName + ".D1224", "0", dev.deviceName + "Queue", false);
}
if (TcpServer.GetBitdata(numm, 3) == 0)
@@ -1589,6 +1619,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 +1730,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 鎵嬪姩||鏁呴殰||鍏呯數锛�8 16 > 1026缁堟銆�);
+ return;
+ }
TaskRepository taskRepository = new TaskRepository();
foreach (var Bssx in new string[] { "1008", "1016" })
{
@@ -1767,6 +1807,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 鎵嬪姩||鏁呴殰||鍏呯數锛�2 10 > 1017缁堟銆�);
+ return;
+ }
TaskRepository taskRepository = new TaskRepository();
foreach (var Bssx in new string[] { "1002", "1010" })
{
@@ -1851,6 +1896,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":
@@ -1891,33 +1937,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");
}
@@ -1928,6 +1974,7 @@
public void ThreadFNK1Over(Tag tag)
{
Console.WriteLine($"ThreadFNK1Over =====>");
+ LogHelper.Info($" FN1 鏃堕棿鎴�{RedisHelper.Get<string>("p鍙戦偅绉�涓嬬嚎#Timestamp", out string mg)}");
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)
@@ -1991,6 +2038,7 @@
public void ThreadFNK2Over(Tag tag)
{
Console.WriteLine($"ThreadFNK2Over =====>");
+ LogHelper.Info($" FN2 鏃堕棿鎴�{RedisHelper.Get<string>("p鍙戦偅绉�涓嬬嚎#Timestamp", out string mg)}");
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)
{
@@ -2054,8 +2102,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鐢宠");
@@ -2093,8 +2141,8 @@
{
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鐢宠");
@@ -2106,8 +2154,8 @@
{
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鐢宠");
@@ -2119,7 +2167,7 @@
{
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鐢宠");
@@ -2132,7 +2180,7 @@
{
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鐢宠");
@@ -2145,7 +2193,7 @@
{
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鐢宠");
@@ -2158,7 +2206,7 @@
{
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鐢宠");
@@ -2171,7 +2219,7 @@
{
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鐢宠");
@@ -2184,7 +2232,7 @@
{
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鐢宠");
@@ -2197,7 +2245,7 @@
{
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鐢宠");
@@ -2248,8 +2296,16 @@
//}
//Console.WriteLine($"SA1030 浠诲姟鐘舵�锛歿tag.SA1030.RtaskState}- 绌洪棽{tag.SA1030.R5绌洪棽}-->瀵瑰簲缁堢偣2001>绌洪棽5锛歿tag.SA2001.R5绌洪棽}");
}
+ static int i = 0;
public void Thread2030Down(Tag tag)
{
+ i++;
+ if (i > 2 * 3600 / 3)
+ {
+ Console.Clear();
+ LogHelper.Info($"寰幆{i}娆�> 娓呯┖鎺у埗鍙般�");
+ i = 0;
+ }
//Console.WriteLine($"SA2030 浠诲姟鐘舵�锛� =====>");
//Console.WriteLine($"SA2030 浠诲姟鐘舵�锛歿tag.SA2030.RtaskState}- 绌洪棽{tag.SA2030.R5绌洪棽} - barcode:{tag.SA2030.R鎵樼洏鐮亇");
@@ -2577,7 +2633,7 @@
type = "A008";
if (tag.SA1022.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣1022 >{tag.SA1022.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2587,7 +2643,7 @@
type = "A007";
if (tag.SA1025.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 1025 >{tag.SA1025.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2597,7 +2653,7 @@
type = "A007";
if (tag.SA2001.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 2001>{tag.SA2001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2607,7 +2663,7 @@
type = "A010";
if (tag.ssx杈撻�绾�s3001.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3001>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -2617,7 +2673,7 @@
type = "A010";
if (tag.ssx杈撻�绾�s3006.R5绌洪棽 != 5)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006 闈炵┖闂诧紝涓嶆帹閫�);
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 缁堢偣 3006>{tag.ssx杈撻�绾�s3001.R5绌洪棽} 闈炵┖闂诧紝涓嶆帹閫�);
continue;
}
}
@@ -3111,7 +3167,7 @@
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}");
+ LogHelper.Info($" {VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("D瀹氬瓙1鍙锋満姊版墜#Timestamp", out string mg)} 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
@@ -3172,7 +3228,7 @@
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}");
+ LogHelper.Info($" {VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("D瀹氬瓙2鍙锋満姊版墜#Timestamp", out string mg)} 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
--
Gitblit v1.9.1