From 95cd9faab13b3c5447a8ae3d658de7296de5fc52 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 25 六月 2025 13:42:17 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 129 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 36 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 e452ea6..63c610a 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;
@@ -236,7 +237,8 @@
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
if (str.Contains("true"))
{
- tag.wxr1.R44_LAST = true;
+ //tag.wxr1.R44_LAST = true;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "true", out string msg);
}
}
else
@@ -251,7 +253,8 @@
{
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))
@@ -267,7 +270,8 @@
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
tag.wxr1.R10 = true;
- tag.wxr1.R44_LAST = false;
+ //tag.wxr1.R44_LAST = false;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
}
else
{
@@ -305,7 +309,8 @@
LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
if (str.Contains("true"))
{
- tag.wxr1.R46_LAST = true;
+ //tag.wxr1.R46_LAST = true;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "true", out string msg);
}
}
else
@@ -319,7 +324,8 @@
{
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))
@@ -335,7 +341,8 @@
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
tag.wxr1.R11 = true;
- tag.wxr1.R46_LAST = false;
+ //tag.wxr1.R46_LAST = false;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
}
else
{
@@ -373,7 +380,8 @@
LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
if (str.Contains("true"))
{
- tag.wxr2.R44_LAST = true;
+ //tag.wxr2.R44_LAST = true;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "true", out string msg);
}
}
else
@@ -387,7 +395,8 @@
{
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))
@@ -403,7 +412,8 @@
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
tag.wxr2.R10 = true;
- tag.wxr2.R44_LAST = false;
+ //tag.wxr2.R44_LAST = false;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
}
else
{
@@ -442,7 +452,8 @@
LogHelper.Info($"{VERX.location[1]}鐢宠mes浠诲姟缁撴灉{str}");
if (str.Contains("true"))
{
- tag.wxr2.R46_LAST = true;
+ //tag.wxr2.R46_LAST = true;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "true", out string msg);
}
}
else
@@ -456,7 +467,8 @@
{
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))
@@ -472,7 +484,8 @@
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
tag.wxr2.R11 = true;
- tag.wxr2.R46_LAST = false;
+ //tag.wxr2.R46_LAST = false;
+ RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
}
else
{
@@ -535,21 +548,44 @@
}
try
{
- LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
#region Rgv
- LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠ｇ爜锛氥�{tag.RGV.RgvrunError}銆�);
+ LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠ｇ爜锛氥�{tag.RGV.RgvrunError}銆�鎵嬪姩1鑷姩2銆恵tag.RGV.R鎵嬪姩1鑷姩2}銆�);
+
+ if (tag.RGV.R鎵嬪姩1鑷姩2 == 1)
+ {
+ LogHelper.Info($"RGV 鎵嬪姩妯″紡锛屼笉鐢ㄧ銆�);
+ return;
+ }
+ if (tag.RGV.taskend == 125)
+ {
+ LogHelper.Info($"RGV 鏈�25鍛戒护鏈墽琛屻�");
+ System.Threading.Thread.Sleep(3000);
+ return;
+ }
+ LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
+
+ 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 +597,10 @@
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;
-
LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅浠诲姟銆�);
if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver == 1)
{
@@ -575,7 +609,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,11 +618,13 @@
if (task1.S_B_STATE == "鍙栬揣瀹屾垚")
{
task1.S_B_STATE = "瀹屾垚";
+ //tag.RGV.ReadTask1No = 0;
}
else
{
task1.S_B_STATE = "鍙栬揣瀹屾垚";
}
+ //tag.RGV.bit1taskOver = 0;
LogHelper.Info($"RGV 1宸ヤ綅浠诲姟{task1.S_TASK_NO} 鐘舵�鍒囨崲涓簕task1.S_B_STATE}");
//tag.RGV.bit1taskOver_LAST = 1;
RedisHelper.Add($"RGV.bit1taskOver_LAST", "1", out string msg);
@@ -624,11 +660,13 @@
if (task2.S_B_STATE == "鍙栬揣瀹屾垚")
{
task2.S_B_STATE = "瀹屾垚";
+ //tag.RGV.ReadTask2No = 0;
}
else
{
task2.S_B_STATE = "鍙栬揣瀹屾垚";
}
+ //tag.RGV.bit2taskOver = 0;
LogHelper.Info($"RGV 2宸ヤ綅浠诲姟{task2.S_TASK_NO} 鐘舵�鍒囨崲涓簕task2.S_B_STATE}");
RedisHelper.Add($"RGV.bit2taskOver_LAST", "1", out string msg);
LogHelper.Info($"RGV 2宸ヤ綅浠诲姟鍐欏鐞�);
@@ -647,14 +685,14 @@
}
//if (thisOver > 0)
- {
- 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 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);
+ // }
+ //}
///1 鏈夎揣 灏� 鍙栥� 1 娌¤揣 灏� 鍗歌揣锛�閮芥湁璐� 灏�鍗歌揣銆�閮芥病璐�灏�鍗� var tklist = taskservice.FindList(x => x.S_B_STATE == "鏈墽琛� && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
@@ -692,7 +730,9 @@
{
LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵�020 1008 1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
tag.RGV.workMod = 2;
+ LogHelper.Info($"{task1.S_TASK_NO}> workMod 2 銆�宸ヤ綅銆�);
tag.RGV.taskmod = 1;
+ LogHelper.Info($"{task1.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 = "宸叉帹閫�;
@@ -753,7 +793,9 @@
{
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);
@@ -771,7 +813,9 @@
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);
@@ -793,9 +837,11 @@
//}
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;
@@ -816,10 +862,13 @@
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);
@@ -845,6 +894,7 @@
public void ThreadGrats(Tag tag, Action<HaiKangOrderInfo> continueTask)
{
Console.WriteLine($"ThreadGrats 鍏夋爡澶勭悊 =================> ");
+
var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
TaskActRepository taskActRepository = new TaskActRepository();
TaskRepository taskRepository = new TaskRepository();
@@ -858,7 +908,13 @@
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;
+ taskActRepository.Update(item);
+ continue;
+ }
string loc = "";
if (tin < 2)
{
@@ -881,8 +937,7 @@
if (dev.deviceType == 1)
{
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");
-
+ Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue", false);
}
else if (dev.deviceType == 2)
{
@@ -907,7 +962,7 @@
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");
+ Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
}
}
@@ -1353,3 +1408,5 @@
}
}
+
+#endregion [鑷畾涔夌被-VS][20250623083459471][AutoThread]
\ No newline at end of file
--
Gitblit v1.9.1