From 3aef561f5056d79e6fc0dac7153b25eb66724373 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 23 六月 2025 09:30:18 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 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 c9fabe9..1fe7d19 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;
@@ -535,10 +536,17 @@
}
try
{
- LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
#region Rgv
LogHelper.Info($"鏌ョ湅RGV 鐢甸噺锛氥�{tag.RGV.R褰撳墠鐢甸噺}銆�鍏呯數鐘舵�锛氥�{tag.RGV.R鍏呯數鐘舵�}銆�鏁呴殰浠ｇ爜锛氥�{tag.RGV.RgvrunError}銆�);
+
+ if (tag.RGV.taskend == 125)
+ {
+ System.Threading.Thread.Sleep(3000);
+ return;
+ }
+ LogHelper.Info("浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆");
+
var task1Isrun = false;
if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
{
@@ -561,7 +569,8 @@
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;
@@ -584,11 +593,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 +635,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宸ヤ綅浠诲姟鍐欏鐞�);
@@ -646,15 +659,17 @@
LogHelper.Info($"RGV 2宸ヤ綅娌℃湁浠诲姟銆�);
}
+
+
//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();
@@ -688,7 +703,7 @@
// 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)
+ if (t2 != null)
{
LogHelper.Info($"鏌ョ湅RGV1 鏈変换鍔task1.S_TASK_NO},宸ヤ綅2 娌′换鍔°� 鎵�020 1008 1016鍙栬揣浠诲姟{t2.S_TASK_NO}銆�);
tag.RGV.workMod = 2;
@@ -810,7 +825,6 @@
LogHelper.Info($"{e1017first.S_TASK_NO}> taskend 鍐�25");
//tag.RGV.taskend=125
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
-
}
else
{
@@ -1155,7 +1169,7 @@
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 != "鍙栨秷");
+ task = taskRepository.FindEntity(x => x.S_END_LOC == item && x.S_B_STATE != "瀹屾垚" && x.S_B_STATE != "鍙栨秷");
msg = "";
if (task != null)
{
@@ -1354,3 +1368,5 @@
}
}
+
+#endregion [鑷畾涔夌被-VS][20250623083459471][AutoThread]
\ No newline at end of file
--
Gitblit v1.9.1