From e279643fa91f426db95f3adfbdfe55681892ae2d Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 20 六月 2025 13:10:08 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 67 +++++++++++++++++++++++++++------
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 7 +--
2 files changed, 57 insertions(+), 17 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 c8078c6..4c1e896 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"
@@ -79,22 +79,19 @@
}
}
-
-
-
-
public void ThreadSettingInit(Tag tag, Action action)
{
Console.WriteLine("鍒濆鍖栭厤缃�绾跨▼ run " + tag.Global.SettingsOver);
if (tag.Global.SettingsOver == 0)
{
- action?.Invoke();
+ action?.Invoke();
tag.Global.SettingsOver = 1;
}
else if (Settings.deviceInfos.Count == 0)
{
tag.Global.SettingsOver = 0;
}
+
}
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 42a03ab..f967b91 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"
@@ -740,12 +740,13 @@
//涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠� while (true)
{
- //if (IsExitApp) { break; }
- LogHelper.Info("浠诲姟涓嬪彂 while 杩涘叆");
+ if (IsExitApp) { break; }
try
{
- LogHelper.Info("浠诲姟涓嬪彂 try 1 杩涘叆");
#region [鑴氭湰][20250325085542733][涓氬姟閫昏緫.浠诲姟涓嬪彂]
+ Console.WriteLine("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr 浠诲姟涓嬪彂");
+ LogHelper.Info("浠诲姟涓嬪彂 try 1 杩涘叆");
+ Console.WriteLine("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr try 浠诲姟涓嬪彂1");
ITaskRepository taskservice = new TaskRepository();
try
@@ -799,15 +800,15 @@
if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
{
task1Isrun = true;
- if (tag.RGV.bit1taskOver_LAST == 1)
- RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
+ //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;
- if (tag.RGV.bit2taskOver_LAST == 1)
- RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
+ //if (tag.RGV.bit2taskOver_LAST == 1)
+ // RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
}
if (task1Isrun || task2Isrun)
{
@@ -1293,7 +1294,31 @@
{
try
{
- foreach (var item in (Bssx == "1020" ? new string[] { "1004", "1012" } : new string[] { "1006", "1014" }))
+ var listtep = new List<string>();
+ if (Bssx == "1020")
+ {
+ if (tag.SF涓嬫枡浣�RArrive1003 == 1)
+ {
+ listtep = new List<string> { "1012", "1004" };
+ }
+ else
+ {
+ listtep = new List<string> { "1004", "1012" };
+ }
+ }
+ else
+ {
+ if (tag.SF涓嬫枡浣�RArrive1005 == 1)
+ {
+ listtep = new List<string> { "1014", "1006" };
+ }
+ else
+ {
+ listtep = new List<string> { "1006", "1014" };
+ }
+ }
+
+ foreach (var item in listtep)//(Bssx == "1020" ? new string[] { "1004", "1012" } : new string[] { "1006", "1014" }))
{
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));
@@ -1608,31 +1633,39 @@
#region [鑴氭湰][20250616095709155][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1鍙稦NK鏈烘鎵嬪畬鎴怾
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);
tag.SF涓嬫枡浣�WRelease1005 = 1;
tag.SF涓嬫枡浣�WSafe0305 = 1;
+ System.Threading.Thread.Sleep(1000);
+ RedisHelper.Add($"FNK1003051113.RArrive1005_LAST", "0", out msg);
}
+ if (tag.FNK1.D2216 == 1)
+ tag.FNK1.D2215 = 0;
else if (tag.FNK1.D2217 == 0 && tag.FNK1.D2217_LAST == 1)
//tag.FNK1.D2217_LAST = 0;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "0", out string msg);
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;
tag.SF涓嬫枡浣�WSafe0305 = 1;
+ System.Threading.Thread.Sleep(1000);
+ RedisHelper.Add($"FNK1003051113.RArrive1003_LAST", "0", out msg);
}
+ //else if (tag.FNK1.D2211 == 1)
+ // tag.FNK1.D2210 = 0;
else if (tag.FNK1.D2212 == 0 && tag.FNK1.D2212_LAST == 1)
{
//tag.FNK1.D2212_LAST = 0;
- RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
+ RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "0", out string msg);
}
+ if (tag.FNK1.D2211 == 1)
+ tag.FNK1.D2210 = 0;
#endregion [鑴氭湰][20250616095709155][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1鍙稦NK鏈烘鎵嬪畬鎴怾
}
@@ -1670,10 +1703,16 @@
tag.SF涓嬫枡浣�WRelease1013 = 1;
tag.SF涓嬫枡浣�WSafe1113 = 1;
+ System.Threading.Thread.Sleep(1000);
+ RedisHelper.Add($"FNK1003051113.RArrive1013_LAST", "0", out msg);
}
else if (tag.FNK2.D2217 == 0 && tag.FNK2.D2217_LAST == 1)
//tag.FNK2.D2217_LAST = 0;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "0", out string msg);
+
+ if (tag.FNK2.D2216 == 1)
+ tag.FNK2.D2215 = 0;
+
if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0)
{
tag.FNK2.D2210 = 0;
@@ -1682,12 +1721,16 @@
tag.SF涓嬫枡浣�WRelease1011 = 1;
tag.SF涓嬫枡浣�WSafe1113 = 1;
+ System.Threading.Thread.Sleep(1000);
+ RedisHelper.Add($"FNK1003051113.RArrive1011_LAST", "0", out msg);
}
else if (tag.FNK2.D2212 == 0 && tag.FNK2.D2212_LAST == 1)
{
//tag.FNK2.D2212_LAST = 0;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "0", out string msg);
}
+ if (tag.FNK2.D2211 == 1)
+ tag.FNK2.D2210 = 0;
#endregion [鑴氭湰][20250616095733680][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.2鍙稦NK鏈烘鎵嬪畬鎴怾
}
catch (Exception ex)
--
Gitblit v1.9.1