From 03746e288fc02c6d2780aeac4cab42299e6b27c4 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 08 七月 2025 17:17:24 +0800
Subject: [PATCH] 1

---
 2025年6月12日/AuxAllWCS/Build/Project/Static/config.json      |   70 +++-
 2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs              |    5 
 2025年6月12日/AuxAllWCS/RunTime/Code/设备通信.cs                  |   28 +-
 2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs              |    1 
 2025年6月12日/AuxAllWCS/Devices/PlcConfig                     |   82 +++---
 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs |  297 +++++++++++++++++++---
 2025年6月12日/AuxAllWCS/Variable/变量数据库.json                   |  242 +++++++++---------
 2025年6月12日/AuxAllWCS/Net/Conn.json                         |    2 
 2025年6月12日/AuxAllWCS/Devices/设备通信.json                     |    2 
 9 files changed, 491 insertions(+), 238 deletions(-)

diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/Static/config.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/Static/config.json"
index 8197e4e..4c30e1c 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/Static/config.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/Static/config.json"
@@ -1,15 +1,15 @@
 {
   "HostToAgvServerUrl": "vvvvvvvvvvvv",
   "HKbaseUrl": "http://10.221.55.249:8181/",
-  "MESbaseUrl":  "https://ktapiwh.mom.aux-home.com/",
+  "MESbaseUrl": "https://ktapiwh.mom.aux-home.com/",
   "WMSbaseUrl": "https://ktapiwh.mom.aux-home.com/",
-  "RunProc":["1"],
+  "RunProc": [ "1" ],
   "deviceInfo": [
     {
       "address": "0",
       "deviceName": "缁村笇灏旀姄鑷�",
-	  "FuLeLineNo":"",
-      "deviceNo": ["10.221.55.147","10.221.55.146"],
+      "FuLeLineNo": "",
+      "deviceNo": [ "10.221.55.147", "10.221.55.146" ],
       "location": [ "VXR1-01", "VXR1-02" ],
       "deviceType": 1,
       "enable": 1
@@ -17,50 +17,82 @@
     {
       "address": "0",
       "deviceName": "缁村笇灏旀姄鑷�",
-      "deviceNo": ["10.221.55.149","10.221.55.148"],
-      "location": [ "VXR2-01","VXR2-02" ],
+      "deviceNo": [ "10.221.55.149", "10.221.55.148" ],
+      "location": [ "VXR2-01", "VXR2-02" ],
       "deviceType": 1,
       "enable": 1
     },
     {
       "address": "0",
       "deviceName": "Js鎹烽『1",
-      "deviceNo": ["JSKS1-101","JSKS1-201"],
-      "location": [ "JSKS1-01","JSKS1-02" ],
+      "deviceNo": [ "JSKS1-101", "JSKS1-201" ],
+      "location": [ "JSKS1-01", "JSKS1-02" ],
       "deviceType": 2,
       "enable": 1
-    },	
+    },
     {
       "address": "0",
       "deviceName": "Js鎹烽『2",
-      "deviceNo": ["JSKS2-101","JSKS2-201"],
-      "location": [ "JSKS2-01","JSKS2-02" ],
+      "deviceNo": [ "JSKS2-101", "JSKS2-201" ],
+      "location": [ "JSKS2-01", "JSKS2-02" ],
       "deviceType": 2,
       "enable": 1
-    },	
+    },
     {
       "address": "0",
       "deviceName": "p鍙戦偅绉�涓嬬嚎",
       "deviceNo": [],
-      "location": [ "1005","1003" ],
+      "location": [ "1005", "1003" ],
       "deviceType": 3,
       "enable": 1
-    },	
+    },
     {
       "address": "0",
       "deviceName": "p鍙戦偅绉�涓嬬嚎",
       "deviceNo": [],
-      "location": [ "1013","1011" ],
+      "location": [ "1013", "1011" ],
       "deviceType": 3,
       "enable": 1
-    },	
+    },
     {
       "address": "0",
-      "deviceName": "SSX&AGV",
-      "deviceNo": [""],
-      "location": [ "1019","1022" ,"1025","1030","2001","2030"],
+      "deviceName": "SSXaAGV 浜や簰",
+      "deviceNo": [ "" ],
+      "location": [ "1019", "1022", "1025", "1030", "2001", "2030", "3001", "3005", "3006", "3010" ],
       "deviceType": 4,
       "enable": 1
+    },
+    {
+      "address": "0",
+      "deviceName": "D瀹氬瓙1鍙锋満姊版墜",
+      "deviceNo": [],
+      "location": [ "DDX-01", "DDX-02" ],
+      "deviceType": 5,
+      "enable": 1
+    },
+    {
+      "address": "0",
+      "deviceName": "D瀹氬瓙2鍙锋満姊版墜",
+      "deviceNo": [],
+      "location": [ "DDX-03", "DDX-04" ],
+      "deviceType": 5,
+      "enable": 1
+    },
+    {
+      "address": "0",
+      "deviceName": "Z杞瓙1鍙锋満姊版墜",
+      "deviceNo": [],
+      "location": [ "", "" ],
+      "deviceType": 6,
+      "enable": 1
+    },
+    {
+      "address": "0",
+      "deviceName": "Z杞瓙2鍙锋満姊版墜",
+      "deviceNo": [],
+      "location": [ "1005", "1003" ],
+      "deviceType": 6,
+      "enable": 1
     }
   ]
 }
\ No newline at end of file
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 8fc49a1..a33c81e 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"
@@ -78,8 +78,8 @@
             }
 
             // 鎵ц濮旀墭
-            if (methodName != "TaskEverythingRun")
-                return null;
+            //if (methodName != "TaskEverythingRun")
+            //    return null;
             return methodDelegate.DynamicInvoke(args);
         }
 
@@ -126,6 +126,41 @@
             }
         }
 
+
+        public void ThreaTotal(Tag tag)
+        {
+            List<Task> tasks = new List<Task>();
+            tasks.Add(GetTask(ThreadMXC3, tag, 3000));
+            tasks.Add(GetTask(ThreadMXC4, tag, 3000));
+            tasks.Add(GetTask(ResetGats, tag, 3000));
+
+
+
+
+
+            Task.WaitAll(tasks.ToArray());
+        }
+
+        private Task GetTask(Action<Tag> action, Tag tag, int i = 2500)
+        {
+            var task = Task.Run(() =>
+            {
+                while (true)
+                {
+                    try
+                    {
+                        action(tag);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Error(ex.Message, ex);
+                    }
+                    Thread.Sleep(i);
+                }
+            });
+            return task;
+        }
+
         public string WriteLine(string value = "")
         {
 
@@ -167,6 +202,7 @@
                 {
                     //tag.Js1.D1212_LAST = 0; 
                     RedisHelper.Add($"Js鎹烽『1.D1202_LAST", "0", out string msg);
+                    //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1224", "0", VERX.deviceName + "Queue");
                 }
 
                 if (tag.Js1.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 1)
@@ -188,6 +224,7 @@
                 {
                     //tag.Js1.D1213_LAST = 0;
                     RedisHelper.Add($"Js鎹烽『1.D1203_LAST", "0", out string msg);
+                    //Conn.榛樿Redis.SetValue(VERX.deviceName + ".D1225", "0", VERX.deviceName + "Queue");
                 }
             }
         }
@@ -650,7 +687,7 @@
                 {
                     LogHelper.Info($"RGV 鏈�25鍛戒护鏈墽琛屻� ");
                     LogHelper.Info($"RGV125鍛戒护鏈墽琛�浠诲姟鏁版嵁 workmode:{tag.RGV.workMod}\n taskmod{tag.RGV.taskmod} \n t1No:{tag.RGV.taskno1}\n t1do:{tag.RGV.task1do} \n t2No:{tag.RGV.taskno2}\n t2do:{tag.RGV.task2do}\n taskend:{tag.RGV.taskend} ");
-                    
+
                     if (tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No)
                     {
                         LogHelper.Info($"RGV125鍛戒护鏈墽琛�tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No  鑷姩娓呴櫎125");
@@ -1069,6 +1106,12 @@
                             Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "0", dev.deviceName + "Queue");
                             Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue");
                         }
+                        else if (dev.deviceType == 5)
+                        {
+                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊 =================> ");
+                            Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "1", dev.deviceName + "Queue");
+                            Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "0", dev.deviceName + "Queue");
+                        }
                         LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 寮�惎鍏夋爡澶勭悊瀹屾垚 =================> ");
 
                         item.N_CREATEMETHOD = 1;
@@ -1078,49 +1121,70 @@
                     //杞﹁杩涘叆浜や簰銆�                     else
                     {
-                        if (dev.deviceType == 1)
+                        if (dev.deviceType == 4)
                         {
-                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊 =================> ");
-                            var tf = Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//璇诲叧闂姸鎬�-                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{tf}");
-                            if (tf?.ToLower() == "true")
-                            {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
-                                continuuuuu = true;
-                            }
-                            else
-                            {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
-                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
-                            }
-                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊瀹屾垚 =================> ");
+                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} SSX AGV 浜や簰銆傘�銆�);
+                            //tag.SA1019.Sagverr
                         }
-                        else if (dev.deviceType == 2)
+                        else
                         {
                             LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊 =================> ");
-                            var tf = Conn.榛樿Redis.GetValue(dev.deviceName + ".D1202");
-                            int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
-                            int close = TcpServer.GetBitdata(numm, (V ? 0 : 1));
-                            LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{close}");
-                            if (close == 1)
+                            if (dev.deviceType == 1)
                             {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
-                                continuuuuu = true;
+                                var tf = Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//璇诲叧闂姸鎬�+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{tf}");
+                                if (tf?.ToLower() == "true")
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
+                                }
                             }
-                            else
+                            else if (dev.deviceType == 2)
                             {
-                                LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue"));
-                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "0", dev.deviceName + "Queue");
-                                Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");
+                                var tf = Conn.榛樿Redis.GetValue(dev.deviceName + ".D1202");
+                                int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
+                                int close = TcpServer.GetBitdata(numm, (V ? 0 : 1));
+                                LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏夋爡鍏抽棴淇″彿{close}");
+                                if (close == 1)
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆� + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue"));
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "0", dev.deviceName + "Queue");
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");
 
-                                string d12201 = RedisHelper.Get<string>(dev.deviceName + "." + (V ? "D1220" : "D1221"), out string msg);
-                                LogHelper.Info($"ThreadGrats 鍐檣(dev.deviceName + "." + (V ? "D1220" : "D1221"))}涓�1 锛�鍚庤{d12201}");
+                                    string d12201 = RedisHelper.Get<string>(dev.deviceName + "." + (V ? "D1220" : "D1221"), out string msg);
+                                    LogHelper.Info($"ThreadGrats 鍐檣(dev.deviceName + "." + (V ? "D1220" : "D1221"))}涓�1 锛�鍚庤{d12201}");
+                                }
+                            }
+                            else if (dev.deviceType == 3)
+                            {
+
+                                var close = (System.UInt16)System.Convert.ChangeType(Conn.榛樿Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16));
+                                if (close == 1)
+                                {
+                                    LogHelper.Info($"{dev.deviceName}{(V ? "宸� : "鍙�)} 鍏夋爡{(goin ? "鍏抽棴" : "寮�惎")} 鐢宠銆�宸茬粡鍏抽棴锛�);
+                                    continuuuuu = true;
+                                }
+                                else
+                                {
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "1", dev.deviceName + "Queue");
+                                    Conn.榛樿Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "0", dev.deviceName + "Queue");
+                                }
                             }
                             LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} 璁惧鏄瘂dev.deviceName} 鍏抽棴鍏夋爡澶勭悊瀹屾垚 =================> ");
                         }
                     }
-
                 }
+
                 if (continuuuuu)
                 {
                     LogHelper.Info($"{item.S_TASK_NO}{item.S_ACTION_CODE} 杞﹁締鍙戦�缁х画浠诲姟锛�);
@@ -1135,6 +1199,9 @@
                 }
             }
             System.Threading.Thread.Sleep(3000);
+        }
+        public void ResetGats(Tag tag)
+        {
             LogHelper.Info($"ThreadGrats deviceType2鍏夋爡鍐欏叆浣嶉噸缃�=================> ");
             //閲嶇疆淇″彿
             foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 2))
@@ -1164,6 +1231,20 @@
                 }
             }
             LogHelper.Info($"ThreadGrats deviceType2鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> ");
+            LogHelper.Info($"ThreadGrats deviceType5鍏夋爡鍐欏叆浣嶉噸缃�=================> ");
+            //閲嶇疆淇″彿
+            //foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 5))
+            {
+                if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
+                    tag.DZ1.D2211 = 0;
+                if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
+                    tag.DZ1.D2216 = 0;
+                if (tag.DZ2.D2211 == 1 && tag.DZ2.D2220 == 1)
+                    tag.DZ2.D2211 = 0;
+                if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
+                    tag.DZ2.D2216 = 0;
+            }
+            LogHelper.Info($"ThreadGrats deviceType5鍏夋爡鍐欏叆浣嶉噸缃畬鎴愩� =================> ");
         }
         /// <summary>
         /// 1020  1023绌烘涓嬬嚎
@@ -1994,12 +2075,12 @@
                                 {
                                     if (device2.deviceName.Contains("Js鎹烽『"))
                                     {
-                                        Task.Run(() =>
-                                        {
-                                            var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
-                                            string V = inde ? "D1224" : "D1225";
-                                            Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
-                                        });
+                                        //Task.Run(() =>
+                                        //{
+                                        var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                        string V = inde ? "D1224" : "D1225";
+                                        Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                        //});
 
                                         var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
                                         {
@@ -2028,6 +2109,31 @@
                                         }));
                                         LogHelper.Info($"{ssloc}鐢宠mes浠诲姟缁撴灉{str}");
                                     }
+                                }
+                                switch (device2.deviceType)
+                                {
+                                    case 4:
+                                        {
+                                            if (wcsTask.S_END_LOC == "2001")
+                                            {
+
+                                            }
+                                        }
+                                        break;
+                                    case 5:
+                                        {
+                                            var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                            string V = inde ? "D2210" : "D2215";
+                                            Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                        }
+                                        break;
+                                    case 6:
+                                        {
+                                            //var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
+                                            //string V = inde ? "D2210" : "D2215";
+                                            //Conn.榛樿Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
+                                        }
+                                        break;
                                 }
                             }
 
@@ -2151,18 +2257,129 @@
             }
         }
 
+        /// <summary>
+        /// 瀹氬瓙1鍙风嚎銆�+        /// 1.澧炲姞涓嬬嚎閫昏緫銆�  2. 鏈夊彇绛愪俊鍙峰氨鍐欙紝娌′俊鍙峰珣鍐�+        /// </summary>
+        /// <param name="tag"></param>
+        public void ThreadMXC3(Tag tag)
+        {
+            var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("1鍙�));
+            if (VERX == null)
+            {
+                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}");
+            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
+                {
+                    requestType = 7,
+                    startBit = VERX.location[0],
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2221_LAST", "1", out string msg);
+            }
+            else if (tag.DZ1.D2221 == 0 && tag.DZ1.D2221_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙1鍙锋満姊版墜.D2221_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2221_LAST", "0", out string msg);
+
+                string V = 0 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
 
 
+            if (tag.DZ1.D2226 == 1 && tag.DZ1.D2226_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[1],
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2226_LAST", "1", out string msg);
+            }
+            else if (tag.DZ1.D2226 == 0 && tag.DZ1.D2226_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙1鍙锋満姊版墜.D2226_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙1鍙锋満姊版墜.D2226_LAST", "0", out string msg);
+                string V = 1 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
 
 
+        }
+        /// <summary>
+        /// 瀹氬瓙2鍙风嚎銆�+        /// </summary>
+        /// <param name="tag"></param>
+        public void ThreadMXC4(Tag tag)
+        {
+            var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("2鍙�));
+            if (VERX == null)
+            {
+                LogHelper.Info("瀹氬瓙2鍙风嚎 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}");
+            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
+                {
+                    requestType = 7,
+                    startBit = VERX.location[0],
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2221_LAST", "1", out string msg);
+            }
+            else if (tag.DZ2.D2221 == 0 && tag.DZ2.D2221_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙2鍙锋満姊版墜.D2221_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2221_LAST", "0", out string msg);
+                string V = 0 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
 
 
+            if (tag.DZ2.D2226 == 1 && tag.DZ2.D2226_LAST == 0)
+            {
+                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
+                {
+                    requestType = 7,
+                    startBit = VERX.location[1],
+                    unLockStartBitOutbin = true
+                }));
+                LogHelper.Info($"{VERX.location[0]}鐢宠mes浠诲姟缁撴灉{str}");
+                var strr = JsonConvert.DeserializeObject<Messss>(str);
+                if (strr != null && strr.success && strr.data?.state == 0)
+                    RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2226_LAST", "1", out string msg);
+            }
+            else if (tag.DZ2.D2226 == 0 && tag.DZ2.D2226_LAST == 1)
+            {
+                LogHelper.Info($"閲嶇疆 D瀹氬瓙2鍙锋満姊版墜.D2226_LAST > 0");
+                RedisHelper.Add($"D瀹氬瓙2鍙锋満姊版墜.D2226_LAST", "0", out string msg);
+                string V = 1 == 0 ? "D2210" : "D2215";
+                Conn.榛樿Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
+            }
 
-
+        }
 
     }
 
 
+
+
     public class HttpServer
     {
         System.Net.HttpListener HttpSvcHost = null;
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 7df8fe7..e4d9dda 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"
@@ -55,6 +55,7 @@
                 //HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
                 //HttpSvcHost.Start();
                 //HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
+                LogHelper.Info("<<<<<<<<<<<Runnnnnnnnnnnnninggggg>>>>>>>>>>");
             }
             catch (Exception ex)
             {
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
index 1795ae3..9159ff1 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\350\207\252\345\256\232\344\271\211\347\261\273.cs"
@@ -430,7 +430,10 @@
         /// <summary>
         ///  1 缁村笇灏旀満姊拌噦
         ///  2 鎹风灛鏈烘鑷傝噦
-        ///  3 鎹风灛杈撻�绾�+        ///  3 楂樺啿鏈烘鎵�+        ///  4 SSXaAGV  浜や簰鐨勮緭閫佺嚎 绾や綋缂栧彿
+        ///  5 瀹氬瓙涓婃枡鏈烘鎵�+        ///  6 杞瓙涓婃枡鏈烘鎵�         /// </summary>
         public int deviceType { get; set; }
         public int enable { get; set; }
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 d465126..4940338 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"
@@ -6603,7 +6603,7 @@
           "Id": "20250615152454900",
           "Order": 1,
           "Name": "D2210",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2210",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2210",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6620,7 +6620,7 @@
           "Id": "20250615152454916",
           "Order": 2,
           "Name": "D2211",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2211",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2211",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6637,7 +6637,7 @@
           "Id": "20250615152454932",
           "Order": 3,
           "Name": "D2212",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2212",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2212",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6654,7 +6654,7 @@
           "Id": "20250615152454979",
           "Order": 4,
           "Name": "D2215",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2215",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2215",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6671,7 +6671,7 @@
           "Id": "20250615152454994",
           "Order": 5,
           "Name": "D2216",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2216",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2216",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6688,7 +6688,7 @@
           "Id": "20250615152455010",
           "Order": 6,
           "Name": "D2217",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2217",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2217",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6705,7 +6705,7 @@
           "Id": "20250615152455025",
           "Order": 7,
           "Name": "D2218",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2218",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2218",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6722,7 +6722,7 @@
           "Id": "20250615152455041",
           "Order": 8,
           "Name": "D2219",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2219",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2219",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6739,7 +6739,7 @@
           "Id": "20250615152455057",
           "Order": 9,
           "Name": "D2220",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2220",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2220",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6756,7 +6756,7 @@
           "Id": "20250615152455073",
           "Order": 10,
           "Name": "D2221",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2221",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2221",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6773,7 +6773,7 @@
           "Id": "20250615152455088",
           "Order": 11,
           "Name": "D2222",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2222",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2222",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6790,7 +6790,7 @@
           "Id": "20250615152455104",
           "Order": 12,
           "Name": "D2223",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2223",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2223",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6807,7 +6807,7 @@
           "Id": "20250615152455119",
           "Order": 13,
           "Name": "D2224",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2224",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2224",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6824,7 +6824,7 @@
           "Id": "20250615152455135",
           "Order": 14,
           "Name": "D2225",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2225",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2225",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6841,7 +6841,7 @@
           "Id": "20250615152455150",
           "Order": 15,
           "Name": "D2226",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2226",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2226",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6858,7 +6858,7 @@
           "Id": "20250615152455165",
           "Order": 16,
           "Name": "D2227",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2227",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2227",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6875,7 +6875,7 @@
           "Id": "20250615152455181",
           "Order": 17,
           "Name": "D2228",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2228",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2228",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6892,7 +6892,7 @@
           "Id": "20250615152455197",
           "Order": 18,
           "Name": "D2229",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2229",
+          "FullName": "D瀹氬瓙1鍙锋満姊版墜.D2229",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6908,13 +6908,13 @@
       ],
       "GroupList": [],
       "Id": "1000032",
-      "Name": "p鍙戦偅绉�涓婄嚎",
+      "Name": "D瀹氬瓙1鍙锋満姊版墜",
       "Desc": "涓�嚎鍦板潃锛�0.221.55.181     绔彛锛�000",
       "Brand": "Melsec",
       "Model": "Q10UDEH",
       "Comm": "MXComponent",
       "IP": "3",
-      "RedisQueueName": "p鍙戦偅绉�涓婄嚎Queue",
+      "RedisQueueName": "D瀹氬瓙1鍙锋満姊版墜Queue",
       "IsSimulate": true,
       "Reserve1": "",
       "Reserve2": "",
@@ -6926,7 +6926,7 @@
           "Id": "20250708093329612",
           "Order": 1,
           "Name": "D2210",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2210",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2210",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6943,7 +6943,7 @@
           "Id": "20250708093329627",
           "Order": 2,
           "Name": "D2211",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2211",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2211",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6960,7 +6960,7 @@
           "Id": "20250708093329642",
           "Order": 3,
           "Name": "D2212",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2212",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2212",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6977,7 +6977,7 @@
           "Id": "20250708093329658",
           "Order": 4,
           "Name": "D2215",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2215",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2215",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -6994,7 +6994,7 @@
           "Id": "20250708093329674",
           "Order": 5,
           "Name": "D2216",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2216",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2216",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7011,7 +7011,7 @@
           "Id": "20250708093329689",
           "Order": 6,
           "Name": "D2217",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2217",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2217",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7028,7 +7028,7 @@
           "Id": "20250708093329705",
           "Order": 7,
           "Name": "D2218",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2218",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2218",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7045,7 +7045,7 @@
           "Id": "20250708093329720",
           "Order": 8,
           "Name": "D2219",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2219",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2219",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7062,7 +7062,7 @@
           "Id": "20250708093329736",
           "Order": 9,
           "Name": "D2220",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2220",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2220",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7079,7 +7079,7 @@
           "Id": "20250708093329751",
           "Order": 10,
           "Name": "D2221",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2221",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2221",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7096,7 +7096,7 @@
           "Id": "20250708093329767",
           "Order": 11,
           "Name": "D2222",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2222",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2222",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7113,7 +7113,7 @@
           "Id": "20250708093329782",
           "Order": 12,
           "Name": "D2223",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2223",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2223",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7130,7 +7130,7 @@
           "Id": "20250708093329797",
           "Order": 13,
           "Name": "D2224",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2224",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2224",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7147,7 +7147,7 @@
           "Id": "20250708093329813",
           "Order": 14,
           "Name": "D2225",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2225",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2225",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7164,7 +7164,7 @@
           "Id": "20250708093329829",
           "Order": 15,
           "Name": "D2226",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2226",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2226",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7181,7 +7181,7 @@
           "Id": "20250708093329844",
           "Order": 16,
           "Name": "D2227",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2227",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2227",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7198,7 +7198,7 @@
           "Id": "20250708093329860",
           "Order": 17,
           "Name": "D2228",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2228",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2228",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7215,7 +7215,7 @@
           "Id": "20250708093329876",
           "Order": 18,
           "Name": "D2229",
-          "FullName": "p鍙戦偅绉�涓婄嚎.D2229",
+          "FullName": "D瀹氬瓙2鍙锋満姊版墜.D2229",
           "DataType": "System.UInt16",
           "DataValue": "",
           "SetValue": "",
@@ -7231,13 +7231,13 @@
       ],
       "GroupList": [],
       "Id": "1000033",
-      "Name": "p鍙戦偅绉�涓婄嚎",
+      "Name": "D瀹氬瓙2鍙锋満姊版墜",
       "Desc": "浜岀嚎鍦板潃锛�0.221.55.179     绔彛锛�000",
       "Brand": "Melsec",
       "Model": "Q10UDEH",
       "Comm": "MXComponent",
       "IP": "4",
-      "RedisQueueName": "p鍙戦偅绉�涓婄嚎Queue",
+      "RedisQueueName": "D瀹氬瓙2鍙锋満姊版墜Queue",
       "IsSimulate": true,
       "Reserve1": "",
       "Reserve2": "",
@@ -7245,5 +7245,5 @@
     }
   ],
   "CreationTime": "2025-02-26 15:31:23",
-  "LastWriteTime": "2025-07-08 09:48:45"
+  "LastWriteTime": "2025-07-08 14:12:07"
 }
\ 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 030eb46..1889230 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-08 09:48:47"
+  "LastWriteTime": "2025-07-08 14:12:20"
 }
\ No newline at end of file
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Net/Conn.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Net/Conn.json"
index 232895b..bd48f57 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Net/Conn.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Net/Conn.json"
@@ -340,5 +340,5 @@
     }
   ],
   "CreationTime": "2025-02-26 15:31:23",
-  "LastWriteTime": "2025-07-08 09:56:59"
+  "LastWriteTime": "2025-07-08 10:35:41"
 }
\ No newline at end of file
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/RunTime/Code/\350\256\276\345\244\207\351\200\232\344\277\241.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/RunTime/Code/\350\256\276\345\244\207\351\200\232\344\277\241.cs"
index 40a4dc0..975a623 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/RunTime/Code/\350\256\276\345\244\207\351\200\232\344\277\241.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/RunTime/Code/\350\256\276\345\244\207\351\200\232\344\277\241.cs"
@@ -70,8 +70,8 @@
 		public GZ.Device.PLC.PlcBase A2030鍙栬揣浜や簰=null;
 		public GZ.Device.PLC.PlcBase RGV=null;
 		public GZ.Device.PLC.PlcBase p鍙戦偅绉�涓嬬嚎=null;
-		public GZ.Device.PLC.PlcBase p鍙戦偅绉�涓婄嚎=null;
-		public GZ.Device.PLC.PlcBase p鍙戦偅绉�涓婄嚎=null;
+		public GZ.Device.PLC.PlcBase D瀹氬瓙1鍙锋満姊版墜=null;
+		public GZ.Device.PLC.PlcBase D瀹氬瓙2鍙锋満姊版墜=null;
 		public Device()
 		{
 			缁村笇灏旀姄鑷� = GZ.Device.PLC.PlcFactory.CreateInstanceByFile
@@ -244,14 +244,14 @@
 				System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "p鍙戦偅绉�涓嬬嚎"),
 				null
 			);
-			p鍙戦偅绉�涓婄嚎 = GZ.Device.PLC.PlcFactory.CreateInstanceByFile
+			D瀹氬瓙1鍙锋満姊版墜 = GZ.Device.PLC.PlcFactory.CreateInstanceByFile
 			(
-				System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "p鍙戦偅绉�涓婄嚎"),
+				System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "D瀹氬瓙1鍙锋満姊版墜"),
 				null
 			);
-			p鍙戦偅绉�涓婄嚎 = GZ.Device.PLC.PlcFactory.CreateInstanceByFile
+			D瀹氬瓙2鍙锋満姊版墜 = GZ.Device.PLC.PlcFactory.CreateInstanceByFile
 			(
-				System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "p鍙戦偅绉�涓婄嚎"),
+				System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "D瀹氬瓙2鍙锋満姊版墜"),
 				null
 			);
 			if(System.Configuration.ConfigurationManager.AppSettings["AutoRunPLC"]=="1")
@@ -290,8 +290,8 @@
 				if(A2030鍙栬揣浜や簰!=null){A2030鍙栬揣浜や簰.Run();}
 				if(RGV!=null){RGV.Run();}
 				if(p鍙戦偅绉�涓嬬嚎!=null){p鍙戦偅绉�涓嬬嚎.Run();}
-				if(p鍙戦偅绉�涓婄嚎!=null){p鍙戦偅绉�涓婄嚎.Run();}
-				if(p鍙戦偅绉�涓婄嚎!=null){p鍙戦偅绉�涓婄嚎.Run();}
+				if(D瀹氬瓙1鍙锋満姊版墜!=null){D瀹氬瓙1鍙锋満姊版墜.Run();}
+				if(D瀹氬瓙2鍙锋満姊版墜!=null){D瀹氬瓙2鍙锋満姊版墜.Run();}
 			}
         }
 	}
@@ -644,22 +644,22 @@
 		}
 		#endregion
 		
-		#region p鍙戦偅绉�涓婄嚎
-		public _p鍙戦偅绉�涓婄嚎 p鍙戦偅绉�涓婄嚎 = new _p鍙戦偅绉�涓婄嚎();
+		#region D瀹氬瓙1鍙锋満姊版墜
+		public _D瀹氬瓙1鍙锋満姊版墜 D瀹氬瓙1鍙锋満姊版墜 = new _D瀹氬瓙1鍙锋満姊版墜();
 		/// <summary>
 		/// 涓�嚎鍦板潃锛�0.221.55.181     绔彛锛�000
 		/// </summary>		
-		public class _p鍙戦偅绉�涓婄嚎
+		public class _D瀹氬瓙1鍙锋満姊版墜
 		{
 		}
 		#endregion
 		
-		#region p鍙戦偅绉�涓婄嚎
-		public _p鍙戦偅绉�涓婄嚎 p鍙戦偅绉�涓婄嚎 = new _p鍙戦偅绉�涓婄嚎();
+		#region D瀹氬瓙2鍙锋満姊版墜
+		public _D瀹氬瓙2鍙锋満姊版墜 D瀹氬瓙2鍙锋満姊版墜 = new _D瀹氬瓙2鍙锋満姊版墜();
 		/// <summary>
 		/// 浜岀嚎鍦板潃锛�0.221.55.179     绔彛锛�000
 		/// </summary>		
-		public class _p鍙戦偅绉�涓婄嚎
+		public class _D瀹氬瓙2鍙锋満姊版墜
 		{
 		}
 		#endregion
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Variable/\345\217\230\351\207\217\346\225\260\346\215\256\345\272\223.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Variable/\345\217\230\351\207\217\346\225\260\346\215\256\345\272\223.json"
index 37fa973..755b213 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Variable/\345\217\230\351\207\217\346\225\260\346\215\256\345\272\223.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Variable/\345\217\230\351\207\217\346\225\260\346\215\256\345\272\223.json"
@@ -7653,10 +7653,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2223",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2223",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2223",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7671,10 +7671,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2210",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2210",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2210",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7689,10 +7689,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2211",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2211",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2211",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7707,10 +7707,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2212",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2212",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2212",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7725,10 +7725,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2215",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2215",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2215",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7743,10 +7743,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2216",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2216",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2216",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7761,10 +7761,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2217",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2217",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2217",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7779,10 +7779,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2218",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2218",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2218",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7797,10 +7797,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2219",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2219",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2219",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7815,10 +7815,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2220",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2220",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2220",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7833,10 +7833,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2221",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2221",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2221",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7851,10 +7851,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2221_LAST",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2221_LAST",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2221_LAST",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7869,10 +7869,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2222",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2222",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2222",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7887,10 +7887,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2224",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2224",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2224",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7905,10 +7905,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2225",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2225",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2225",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7923,10 +7923,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2226",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2226",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2226",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7941,10 +7941,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2226_LAST",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2226_LAST",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2226_LAST",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7959,10 +7959,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2227",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2227",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2227",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7977,10 +7977,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2228",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2228",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2228",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -7995,10 +7995,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙1鍙锋満姊版墜",
             "MapParam": "D2229",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2229",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙1鍙锋満姊版墜.D2229",
+            "Queue": "D瀹氬瓙1鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094856987",
             "GroupFullName": "Tag.DZ1",
@@ -8024,10 +8024,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2223",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2223",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2223",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8042,10 +8042,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2210",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2210",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2210",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8060,10 +8060,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2211",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2211",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2211",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8078,10 +8078,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2212",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2212",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2212",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8096,10 +8096,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2215",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2215",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2215",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8114,10 +8114,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2216",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2216",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2216",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8132,10 +8132,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2217",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2217",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2217",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8150,10 +8150,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2218",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2218",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2218",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8168,10 +8168,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2219",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2219",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2219",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8186,10 +8186,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2220",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2220",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2220",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8204,10 +8204,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2221",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2221",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2221",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8222,10 +8222,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2221_LAST",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2221_LAST",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2221_LAST",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8240,10 +8240,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2222",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2222",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2222",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8258,10 +8258,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2224",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2224",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2224",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8276,10 +8276,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2225",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2225",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2225",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8294,10 +8294,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2226",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2226",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2226",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8312,10 +8312,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2226_LAST",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2226_LAST",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2226_LAST",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8330,10 +8330,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2227",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2227",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2227",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8348,10 +8348,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2228",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2228",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2228",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8366,10 +8366,10 @@
             "MinVal": "",
             "MaxVal": "",
             "DefaultVal": "",
-            "MapDevice": "p鍙戦偅绉�涓婄嚎",
+            "MapDevice": "D瀹氬瓙2鍙锋満姊版墜",
             "MapParam": "D2229",
-            "Map": "p鍙戦偅绉�涓婄嚎.D2229",
-            "Queue": "p鍙戦偅绉�涓婄嚎Queue",
+            "Map": "D瀹氬瓙2鍙锋満姊版墜.D2229",
+            "Queue": "D瀹氬瓙2鍙锋満姊版墜Queue",
             "Converter": "",
             "GroupID": "20250708094929744",
             "GroupFullName": "Tag.DZ2",
@@ -8381,7 +8381,7 @@
     ]
   },
   "CreationTime": "2025-02-26 15:31:23",
-  "LastWriteTime": "2025-07-08 09:49:43",
+  "LastWriteTime": "2025-07-08 14:11:39",
   "Sample": {
     "ID": "",
     "Name": "Tag",

--
Gitblit v1.9.1