From 60dc4564fabd9f4afed46d4c91aac7b6db9b9e6d Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 10 七月 2025 14:16:10 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Devices/PlcConfig | 6 +++---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 13 +++++--------
2025年6月12日/AuxAllWCS/Devices/设备通信.json | 2 +-
3 files changed, 9 insertions(+), 12 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 b7d2aec..d28c119 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"
@@ -188,9 +188,6 @@
tasks.Add(GetTask(sa3006, tag, 3000));
tasks.Add(GetTask(sa3010, tag, 3000));
-
-
-
Task.WaitAll(tasks.ToArray());
}
@@ -1889,7 +1886,7 @@
if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
{
//tag.FNK1.D2215 = 0;
- tag.FNK1.D2218 = 1;
+ //tag.FNK1.D2218 = 1;
//tag.FNK1.D2212_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
@@ -1916,7 +1913,7 @@
LogHelper.Info($" FN1 D2212>{tag.FNK1.D2212} D2212LAST>{tag.FNK1.D2212_LAST} D2210>{tag.FNK1.D2210} D2211>{tag.FNK1.D2211} D2213>{tag.FNK1.D2213}");
if (tag.FNK1.D2212 == 1 && tag.FNK1.D2212_LAST == 0)
{
- tag.FNK1.D2213 = 1;
+ //tag.FNK1.D2213 = 1;
//tag.FNK1.D2210 = 0;
//tag.FNK1.D2217_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
@@ -1951,7 +1948,7 @@
if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
{
//tag.FNK2.D2215 = 0;
- tag.FNK2.D2218 = 1;
+ //tag.FNK2.D2218 = 1;
//tag.FNK2.D2212_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2217_LAST", "1", out string msg);
@@ -1980,7 +1977,7 @@
if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0)
{
//tag.FNK2.D2210 = 0;
- tag.FNK2.D2213 = 1;
+ //tag.FNK2.D2213 = 1;
//tag.FNK2.D2217_LAST = 1;
RedisHelper.Add($"p鍙戦偅绉�涓嬬嚎.D2212_LAST", "1", out string msg);
@@ -2561,7 +2558,7 @@
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟");
//鐩存帴鐢熸垚瀵瑰簲浠诲姟銆�- var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>(), type);
+ var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>(), "AGV", type);
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟 缁撴灉锛歿res}");
if (res)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
index c416493..9a2fc75 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/PlcConfig"
@@ -6932,7 +6932,7 @@
"Comm": "MXComponent",
"IP": "3",
"RedisQueueName": "D瀹氬瓙1鍙锋満姊版墜Queue",
- "IsSimulate": true,
+ "IsSimulate": false,
"Reserve1": "",
"Reserve2": "",
"Reserve3": ""
@@ -7255,7 +7255,7 @@
"Comm": "MXComponent",
"IP": "4",
"RedisQueueName": "D瀹氬瓙2鍙锋満姊版墜Queue",
- "IsSimulate": true,
+ "IsSimulate": false,
"Reserve1": "",
"Reserve2": "",
"Reserve3": ""
@@ -9523,5 +9523,5 @@
}
],
"CreationTime": "2025-02-26 15:31:23",
- "LastWriteTime": "2025-07-10 11:26:21"
+ "LastWriteTime": "2025-07-10 14:15:37"
}
\ No newline at end of file
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
index b00ae70..ec1c8b1 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices/\350\256\276\345\244\207\351\200\232\344\277\241.json"
@@ -2,5 +2,5 @@
"ProjectSn": "1",
"DeviceList": [],
"CreationTime": "2025-02-26 15:31:23",
- "LastWriteTime": "2025-07-10 11:26:36"
+ "LastWriteTime": "2025-07-10 14:15:49"
}
\ No newline at end of file
--
Gitblit v1.9.1