From e788601bc3a2028f1e573796e038f3d6cb9961b3 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期六, 21 六月 2025 16:52:52 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Dlls/GZ.Device.PLC.dll | 0
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 26 -----
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 245 ++++++++++++++++++++++++++++++++++--------------
3 files changed, 171 insertions(+), 100 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 cb6fa18..c9fabe9 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"
@@ -12,6 +12,8 @@
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Repository.OIDATABASE;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using System.Windows.Interop;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
namespace GZ.Projects.AuxAllWCS
{
@@ -675,58 +677,79 @@
LogHelper.Info($"{task1.S_TASK_NO}> end 鍐�125");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
- else //1鏈変换鍔� 2 娌′换鍔°�
+ else //1鏈変换鍔� 2 娌′换鍔°�
{
+
LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵惧悓渚у彇璐т换鍔°�");
- //1 濡傛灉鏈夊悓渚у彇璐т换鍔°�灏卞彇銆傛病鏈�+
var leftSide = new List<string> { "1023", "1020" };
var RightSide = new List<string> { "1002", "1008", "1010", "1016" };
bool creT2 = false;
- if (leftSide.Contains(task1.S_START_LOC))
+
+ // 2鍙�浼樺厛缁�1020 1008 1016
+ 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)
{
- leftSide.Remove(task1.S_START_LOC);
- var lsde = leftSide.FirstOrDefault();
- var t2 = tklist.Find(x => x.S_START_LOC == lsde && x.S_END_LOC != "1017");
- if (t2 != null) //鍚屼晶鍙栬揣浠诲姟銆�- {
- LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵惧悓渚у彇璐т换鍔t2.S_TASK_NO}銆�);
- tag.RGV.workMod = 2;
- tag.RGV.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 = "宸叉帹閫�;
- 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);
- LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
- Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
- }
+ LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵�020 1008 1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
+ tag.RGV.workMod = 2;
+ tag.RGV.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 = "宸叉帹閫�;
+ 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);
+ LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
- else if (RightSide.Contains(task1.S_START_LOC))
- {
- RightSide.Remove(task1.S_START_LOC);
- var t2 = tklist.Find(x => RightSide.Contains(x.S_START_LOC) && x.S_END_LOC != "1017");
- if (t2 != null) //鍚屼晶鍙栬揣浠诲姟銆�- {
- LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵惧悓渚у彇璐т换鍔t2.S_TASK_NO}銆�);
- tag.RGV.workMod = 2;
- tag.RGV.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 = "宸叉帹閫�;
- 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);
- LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
- Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
- }
- }
- //else //1 鐩存帴鍗歌揣銆�
- if (!creT2)
+ ////2 濡傛灉鏈夊悓渚у彇璐т换鍔°�灏卞彇銆傛病鏈�+ //else if (leftSide.Contains(task1.S_START_LOC))
+ //{
+ // leftSide.Remove(task1.S_START_LOC);
+ // var lsde = leftSide.FirstOrDefault();
+ // t2 = tklist.Find(x => x.S_START_LOC == lsde && x.S_END_LOC != "1017");
+ // if (t2 != null) //鍚屼晶鍙栬揣浠诲姟銆�+ // {
+ // LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵惧悓渚у彇璐т换鍔t2.S_TASK_NO}銆�);
+ // tag.RGV.workMod = 2;
+ // tag.RGV.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 = "宸叉帹閫�;
+ // 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);
+ // LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ // Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ // }
+ //}
+ //else if (RightSide.Contains(task1.S_START_LOC))
+ //{
+ // RightSide.Remove(task1.S_START_LOC);
+ // t2 = tklist.Find(x => RightSide.Contains(x.S_START_LOC) && x.S_END_LOC != "1017");
+ // if (t2 != null) //鍚屼晶鍙栬揣浠诲姟銆�+ // {
+ // LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵惧悓渚�1002,1010 鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
+ // tag.RGV.workMod = 2;
+ // tag.RGV.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 = "宸叉帹閫�;
+ // 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);
+ // LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ // Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ // }
+ //}
+ else //1 鐩存帴鍗歌揣銆�
+ //if (!creT2)
{
LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 娌℃湁鍚屼晶鍙栬揣浠诲姟 1宸ヤ綅鍗歌揣銆�);
tag.RGV.workMod = 1;
@@ -758,19 +781,19 @@
LogHelper.Info($"{task2.S_TASK_NO}> taskend 鍐�25");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
}
- else //1mei 浠诲姟 2 娌′换鍔°�
+ else if (tklist.Any()) //1mei 浠诲姟 2 娌′换鍔°�
{
LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅娌′换鍔�宸ヤ綅2 涔熸病浠诲姟銆備紭鍏�宸ヤ綅缁堢偣1017浠诲姟銆傘�");
//銆佷笅 1017浠诲姟 缁�鍙峰伐浣嶃�
- var lss = tklist.Take(2).ToList();
- var e1017first = lss.Find(x => x.S_END_LOC == "1017");
- if (e1017first == null)
- {
- e1017first = lss.FirstOrDefault();
- }
+ //var lss = tklist.Take(2).ToList();
+ var e1017first = tklist.Find(x => x.S_START_LOC == "1002" || x.S_START_LOC == "1010" || x.S_START_LOC == "1023");
+ //if (e1017first != null)
+ //{
+ // e1017first = tklist.FirstOrDefault();
+ //}
if (e1017first != null)
{
- LogHelper.Info($"鏌ョ湅RGV 1宸ヤ綅娌′换鍔�宸ヤ綅2 涔熸病浠诲姟銆�宸ヤ綅涓嬩换鍔e1017first.S_TASK_NO}> 缁堢偣{e1017first.S_END_LOC}銆�);
+ LogHelper.Info($"鏌ョ湅RGV1 浠诲姟宸ヤ綅2 娌′换鍔°� 1002 1010 1023鍙栬揣浠诲姟{e1017first.S_TASK_NO}銆�);
tag.RGV.workMod = 1;
tag.RGV.taskmod = 1;
uint tno = Convert.ToUInt32(e1017first.S_TASK_NO.Substring(4));
@@ -788,6 +811,25 @@
//tag.RGV.taskend=125
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ }
+ else
+ {
+ 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}銆�);
+ tag.RGV.workMod = 2;
+ tag.RGV.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 = "宸叉帹閫�;
+ taskservice.Update(t2);
+ System.Threading.Thread.Sleep(750);
+ LogHelper.Info($"{t2.S_TASK_NO}> bit2taskOver_LAST 鍐�0");
+ RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+ LogHelper.Info($"{t2.S_TASK_NO}> end 鍐�125");
+ Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
+ }
}
}
}
@@ -920,7 +962,6 @@
}
}
-
/// <summary>
/// 1020 1023绌烘涓嬬嚎
/// </summary>
@@ -928,14 +969,23 @@
public void ThreadEdown(Tag tag)
{
Console.WriteLine($"ThreadEdown 20 23 = 绌轰笅妫�祴 =================> ");
+ TaskRepository taskRepository = new TaskRepository();
foreach (var Bssx in new string[] { "1020", "1023" })
{
var RtaskState = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{Bssx}Read.RtaskState"), typeof(System.UInt16));
var RtaskState_LAST = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{Bssx}Read.RtaskState_LAST"), typeof(System.UInt16));
var R鎵樼洏鐮�= (System.String)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{Bssx}Read.R鎵樼洏鐮�), typeof(System.String));
- Console.WriteLine($"{Bssx} 绌轰笅妫�祴锛氫换鍔＄敵璇凤細{RtaskState}- 鏄惁宸插鐞嗭細{RtaskState_LAST}- 鎵樼洏鐮侊細{R鎵樼洏鐮亇");
+ Console.WriteLine($"{Bssx} 绌轰笅妫�祴锛氫换鍔＄敵璇凤細{RtaskState}- 鏄惁宸插鐞嗭細{RtaskState_LAST}- 鎵樼洏鐮侊細{R鎵樼洏鐮亇 ");
if (RtaskState == 3 && RtaskState_LAST == 0)
{
+ var task = taskRepository.FindEntity(x => x.S_START_LOC == Bssx && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ string msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
try
{
var listtep = new List<string>();
@@ -966,22 +1016,31 @@
{
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 == 0)
+ if (R5 == 5 && R5绌洪棽_LAST == 0 && task == null)
{
+ task = taskRepository.FindEntity(x => x.S_END_LOC == item && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($" {item}鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($" {item}鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
+
var b = TaskProcess.CreateTask("", Bssx, item, "绌轰笂RGV", 5, new List<string> { R鎵樼洏鐮�}, "RGV");
if (b)
{
LogHelper.Debug($"杈撻�绾縍GV绌烘墭浠诲姟 from:{Bssx}>to {item}寮�鍒涘缓鎴愬姛");
- RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out string msg);
+ RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
//Conn.榛樿Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
- RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out string msg1);
+ RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out msg);
//Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "1", $"S{item}ReadQueue");
break;
}
}
else if (R5 != 5 && R5绌洪棽_LAST == 1)
{
- RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "0", out string msg);
+ RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "0", out msg);
//Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "0", $"S{item}ReadQueue");
}
}
@@ -1016,6 +1075,7 @@
public void ThreadDdown(Tag tag)
{
Console.WriteLine($"ThreadDdown 08 10 ==================> 1026");
+ TaskRepository taskRepository = new TaskRepository();
foreach (var Bssx in new string[] { "1008", "1016" })
{
var RtaskState = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{Bssx}Read.RtaskState"), typeof(System.UInt16));
@@ -1024,15 +1084,32 @@
Console.WriteLine($"{Bssx} 婊′笅妫�祴锛氫换鍔＄敵璇凤細{RtaskState}- 鏄惁宸插鐞嗭細{RtaskState_LAST}- 鎵樼洏鐮侊細{R鎵樼洏鐮亇");
if (RtaskState == 3 && RtaskState_LAST == 0)
{
+ var task = taskRepository.FindEntity(x => x.S_START_LOC == Bssx && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ string msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
+
var item = "1026";
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 == 0)
{
+ task = taskRepository.FindEntity(x => x.S_END_LOC == item && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($"{item} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($"{item} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
var b = TaskProcess.CreateTask("", Bssx, item, "婊¤浆1026", 5, new List<string> { R鎵樼洏鐮�}, "RGV");
if (b)
{
- RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out string msg);
+ RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out string msg2);
//Conn.榛樿Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
//Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "1", $"S{item}ReadQueue");
@@ -1056,6 +1133,7 @@
public void Thread0210Down(Tag tag)
{
Console.WriteLine($"Thread0210Down ==================>");
+ TaskRepository taskRepository = new TaskRepository();
foreach (var Bssx in new string[] { "1002", "1010" })
{
var RtaskState = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"S{Bssx}Read.RtaskState"), typeof(System.UInt16));
@@ -1064,15 +1142,31 @@
Console.WriteLine($"{Bssx} 婊′笅妫�祴锛氫换鍔＄敵璇凤細{RtaskState}- 鏄惁宸插鐞嗭細{RtaskState_LAST}- 鎵樼洏鐮侊細{R鎵樼洏鐮亇");
if (RtaskState == 3 && RtaskState_LAST == 0)
{
+ var task = taskRepository.FindEntity(x => x.S_START_LOC == Bssx && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ string msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($"{Bssx} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
var item = "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 == 0)
{
+ task = taskRepository.FindEntity(x => x.S_END_LOC == Bssx && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
+ msg = "";
+ if (task != null)
+ {
+ Console.WriteLine($"{item} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ LogHelper.Info($"{item} 鏈夋鍦�[{task.S_B_STATE}] 涓殑{task.S_TASK_NO}浠诲姟");
+ continue;
+ }
var b = TaskProcess.CreateTask("", Bssx, item, "婊¤浆1017", 5, new List<string> { R鎵樼洏鐮�}, "RGV");
if (b)
{
- RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out string msg);
+ RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
RedisHelper.Add($"S{item}Read.R5绌洪棽_LAST", "1", out string msg1);
//Conn.榛樿Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
//Conn.榛樿Redis.SetValue($"S{item}Read.R5绌洪棽_LAST", "1", $"S{item}ReadQueue");
@@ -1102,41 +1196,42 @@
var RArriveLast = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue($"FNK1003051113.RArrive{ssx}_LAST"), typeof(System.UInt16));
if (RArrive == 1 && RArriveLast == 0)
{
- if (ssx == "1005")
+ if (ssx == "1005" && tag.SF涓嬫枡浣�WRelease1005 == 0)
{
tag.FNK1.D2215 = 1;
//tag.SF涓嬫枡浣�RArrive1005_LAST = 1;
RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "1", out string msg);
- tag.SF涓嬫枡浣�WRelease1005 = 0;
- tag.SF涓嬫枡浣�WSafe0305 = 0;
+ //tag.SF涓嬫枡浣�WRelease1005 = 0;
+ //tag.SF涓嬫枡浣�WSafe0305 = 0;
}
- else if (ssx == "1003")
+ else if (ssx == "1003" && tag.SF涓嬫枡浣�WRelease1003 == 0)
{
tag.FNK1.D2210 = 1;
//tag.SF涓嬫枡浣�RArrive1003_LAST = 1;
RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "1", out string msg);
- tag.SF涓嬫枡浣�WRelease1003 = 0;
- tag.SF涓嬫枡浣�WSafe0305 = 0;
+
+ //tag.SF涓嬫枡浣�WRelease1003 = 0;
+ //tag.SF涓嬫枡浣�WSafe0305 = 0;
}
- else if (ssx == "1013")
+ else if (ssx == "1013" && tag.SF涓嬫枡浣�WRelease1013 == 0)
{
tag.FNK2.D2215 = 1;
//tag.SF涓嬫枡浣�RArrive1013_LAST = 1;
RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "1", out string msg);
- tag.SF涓嬫枡浣�WRelease1013 = 0;
- tag.SF涓嬫枡浣�WSafe1113 = 0;
+ //tag.SF涓嬫枡浣�WRelease1013 = 0;
+ //tag.SF涓嬫枡浣�WSafe1113 = 0;
}
- else if (ssx == "1011")
+ else if (ssx == "1011" && tag.SF涓嬫枡浣�WRelease1011 == 0)
{
tag.FNK2.D2210 = 1;
//tag.SF涓嬫枡浣�RArrive1011_LAST = 1;
RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "1", out string msg);
- tag.SF涓嬫枡浣�WRelease1011 = 0;
- tag.SF涓嬫枡浣�WSafe1113 = 0;
+ //tag.SF涓嬫枡浣�WRelease1011 = 0;
+ //tag.SF涓嬫枡浣�WSafe1113 = 0;
}
}
else if (RArrive == 0 && RArriveLast == 1)
@@ -1152,7 +1247,7 @@
Console.WriteLine($"ThreadFNK1Over =====>");
if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
{
- //tag.FNK1.D2215 = 0;
+ tag.FNK1.D2215 = 0;
//tag.FNK1.D2212_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
@@ -1169,6 +1264,7 @@
if (tag.FNK1.D2212 == 1 && tag.FNK1.D2212_LAST == 0)
{
+ tag.FNK1.D2210 = 0;
//tag.FNK1.D2217_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
tag.SF涓嬫枡浣�WRelease1003 = 1;
@@ -1226,6 +1322,7 @@
}
if (tag.FNK2.D2211 == 1)
tag.FNK2.D2210 = 0;
+
}
public void Thread1019Down(Tag tag)
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 9fa56c7..dcd8065 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"
@@ -344,7 +344,6 @@
{
#region [鑴氭湰][20250325083315503][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�L]
AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr2L", new object[] { tag });
-
#endregion [鑴氭湰][20250325083315503][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�L]
}
catch (Exception ex)
@@ -388,31 +387,6 @@
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>
/// 绋嬪簭鐗囨:浠诲姟涓嬪彂
/// 鎻忚堪:
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Dlls/GZ.Device.PLC.dll" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Dlls/GZ.Device.PLC.dll"
index cb9ebec..1b40f7a 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Dlls/GZ.Device.PLC.dll"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Dlls/GZ.Device.PLC.dll"
Binary files differ
--
Gitblit v1.9.1