From 1cd9ee1a2b74a47e48c637482555388e20bb4eab Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 17 七月 2025 11:30:18 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Devices/PlcConfig | 22 +++++++++++-----------
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 10 ++++++----
2025年6月12日/AuxAllWCS/Devices.rar | 0
2025年6月12日/AuxAllWCS/Devices/设备通信.json | 2 +-
4 files changed, 18 insertions(+), 16 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 ed756b0..bd1b4f7 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"
@@ -282,7 +282,7 @@
if (VERX != null)
{
- LogHelper.Info($"{VERX.deviceName} D1212>{tag.Js1.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
+ LogHelper.Info($"{VERX.deviceName}鏃堕棿鎴�{RedisHelper.Get<string>("Js鎹烽『1#Timestamp", out string mg)} D1212>{tag.Js1.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
if (tag.Js1.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 1)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -340,7 +340,7 @@
if (VERX != null)
{
- LogHelper.Info($"{VERX.deviceName} D1212>{tag.Js2.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
+ LogHelper.Info($"{VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("Js鎹烽『2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} 宸︽弧淇″彿:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} 鍙虫弧淇″彿>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
if (tag.Js2.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 1)
{
@@ -1974,6 +1974,7 @@
public void ThreadFNK1Over(Tag tag)
{
Console.WriteLine($"ThreadFNK1Over =====>");
+ LogHelper.Info($" FN1 鏃堕棿鎴�{RedisHelper.Get<string>("p鍙戦偅绉�涓嬬嚎#Timestamp", out string mg)}");
LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
//LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 鍐�2215=0锛孌2217_LAST=1锛學Release1005=1 RArrive1005_LAST=0");
if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
@@ -2037,6 +2038,7 @@
public void ThreadFNK2Over(Tag tag)
{
Console.WriteLine($"ThreadFNK2Over =====>");
+ LogHelper.Info($" FN2 鏃堕棿鎴�{RedisHelper.Get<string>("p鍙戦偅绉�涓嬬嚎#Timestamp", out string mg)}");
LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2218>{tag.FNK2.D2218}");
if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
{
@@ -3165,7 +3167,7 @@
LogHelper.Info("瀹氬瓙1鍙风嚎 deviceType 5 娌℃湁閰嶇疆銆�);
return;
}
- LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST} D2226>{tag.DZ1.D2226} D2226_LAST>{tag.DZ1.D2226_LAST}");
+ LogHelper.Info($" {VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("D瀹氬瓙1鍙锋満姊版墜#Timestamp", out string mg)} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST} D2226>{tag.DZ1.D2226} D2226_LAST>{tag.DZ1.D2226_LAST}");
if (tag.DZ1.D2221 == 1 && tag.DZ1.D2221_LAST == 0)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -3226,7 +3228,7 @@
LogHelper.Info("瀹氬瓙2鍙风嚎 deviceType 5 娌℃湁閰嶇疆銆�);
return;
}
- LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST} D2226>{tag.DZ2.D2226} D2226_LAST>{tag.DZ2.D2226_LAST}");
+ LogHelper.Info($" {VERX.deviceName} 鏃堕棿鎴�{RedisHelper.Get<string>("D瀹氬瓙2鍙锋満姊版墜#Timestamp", out string mg)} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST} D2226>{tag.DZ2.D2226} D2226_LAST>{tag.DZ2.D2226_LAST}");
if (tag.DZ2.D2221 == 1 && tag.DZ2.D2221_LAST == 0)
{
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices.rar" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices.rar"
index 86b22f6..48b8963 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices.rar"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Devices.rar"
Binary files differ
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 1b5c315..d108f2e 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"
@@ -1507,7 +1507,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "D214",
+ "Address": "D2214",
"AddrType": "",
"Length": 1,
"Desc": "",
@@ -4958,7 +4958,7 @@
"DataType": "System.UInt32",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2172",
+ "Address": "DB100.2102",
"AddrType": "",
"Length": 2,
"Desc": "鎵ц浠诲姟鍙�,
@@ -4975,7 +4975,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2176",
+ "Address": "DB100.2106",
"AddrType": "",
"Length": 1,
"Desc": "璧峰鍦板潃",
@@ -4992,7 +4992,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2178",
+ "Address": "DB100.2108",
"AddrType": "",
"Length": 1,
"Desc": "鐩爣鍦板潃",
@@ -5009,7 +5009,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2180",
+ "Address": "DB100.2110",
"AddrType": "",
"Length": 1,
"Desc": "宸ヤ綔妯″紡 0-鏃犳晥,1-鎵嬪姩,2-鑱旀満,3-鑴辨満 ",
@@ -5026,7 +5026,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2182",
+ "Address": "DB100.2112",
"AddrType": "",
"Length": 1,
"Desc": "鐘舵�鏍囧織",
@@ -5043,7 +5043,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2184",
+ "Address": "DB100.2114",
"AddrType": "",
"Length": 1,
"Desc": "0-鏃犳晥,1-浠诲姟鐢宠,2-浠诲姟鎺ユ敹瀹屾垚,3-鐢宠RGV浠诲姟 4-鐢宠agv浠诲姟",
@@ -5060,7 +5060,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2210",
+ "Address": "DB100.2140",
"AddrType": "",
"Length": 1,
"Desc": "0-鏃犳晥锛�-绌洪棽鐘舵�",
@@ -5077,7 +5077,7 @@
"DataType": "System.String",
"DataValue": "",
"SetValue": "",
- "Address": "DB100.2212",
+ "Address": "DB100.2142",
"AddrType": "",
"Length": 10,
"Desc": "鎵樼洏鐮�,
@@ -6335,7 +6335,7 @@
"DataType": "System.UInt16",
"DataValue": "",
"SetValue": "",
- "Address": "D214",
+ "Address": "D2214",
"AddrType": "",
"Length": 1,
"Desc": "",
@@ -9523,5 +9523,5 @@
}
],
"CreationTime": "2025-02-26 15:31:23",
- "LastWriteTime": "2025-07-15 10:35:06"
+ "LastWriteTime": "2025-07-17 11:13:08"
}
\ 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 5a99548..0e156c0 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-15 10:35:06"
+ "LastWriteTime": "2025-07-17 11:13:08"
}
\ No newline at end of file
--
Gitblit v1.9.1