From 1c3a7657a5ada8a9ec7e2a6e4a396348c727395d Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期六, 28 六月 2025 17:34:22 +0800 Subject: [PATCH] 1 --- 2025年6月12日/AuxAllWCS/Build/Project/AuxAllWCS.csproj | 2 +- 2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 2 +- 2025年6月12日/AuxAllWCS/AuxAllWCS.json | 2 +- 2025年6月12日/AuxAllWCS/Variable/变量数据库.json | 38 +++++++++++++++++++++++++++++++++++++- 2025年6月12日/AuxAllWCS/Net/Conn.json | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/AuxAllWCS.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/AuxAllWCS.json" index b8725e4..5f9522c 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/AuxAllWCS.json" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/AuxAllWCS.json" @@ -9,5 +9,5 @@ "DevelopVersion": "1.0.2.0", "Encode": "Ij/zvOgkqNT5SmHrFKCAVQ==", "CreationTime": "0001-01-01 00:00:00", - "LastWriteTime": "2025-06-28 14:27:30" + "LastWriteTime": "2025-06-28 17:31:04" } \ No newline at end of file diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" index 20e4924..d20adec 100644 --- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" +++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/AuxAllWCS.csproj" @@ -6,7 +6,7 @@ <RootNamespace>GZ.Projects.AuxAllWCS</RootNamespace> <AssemblyName>AuxAllWCS</AssemblyName> <TargetFrameworkVersion>4.6.1</TargetFrameworkVersion> - <ProjectGuid>{82EA179A-6597-455E-9F4E-73A8481A8E3A}</ProjectGuid> + <ProjectGuid>{C950A000-450B-4228-ACC3-1A66CF2409B5}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <PlatformTarget>AnyCPU</PlatformTarget> 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 655f291..5aed7f8 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" @@ -577,7 +577,7 @@ System.Threading.Thread.Sleep(3000); return; } - LogHelper.Info($"浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆 Rgv淇℃伅 ReadTask1No>{tag.RGV.ReadTask1No} bit1taskOver>{tag.RGV.bit1taskOver} ReadTask2No>{tag.RGV.ReadTask2No} bit2taskOver>{tag.RGV.bit2taskOver}"); + LogHelper.Info($"浠诲姟涓嬪彂 Rgv 浠诲姟 杩涘叆 Rgv淇℃伅 W1鐘舵�{tag.RGV.w1status} ReadTask1No>{tag.RGV.ReadTask1No} bit1taskOver>{tag.RGV.bit1taskOver} W2鐘舵�{tag.RGV.w2status} ReadTask2No>{tag.RGV.ReadTask2No} bit2taskOver>{tag.RGV.bit2taskOver}"); TaskEntity task1 = null; TaskEntity task2 = null; var task1Isrun = false; 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 4e9d0f5..e895095 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-06-28 14:27:30" + "LastWriteTime": "2025-06-28 17:31:04" } \ No newline at end of file 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 a20ad86..d5015b6 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" @@ -7513,6 +7513,42 @@ "GroupID": "20250615174530321", "GroupFullName": "Tag.RGV", "FullName": "Tag.RGV.R鎵嬪姩1鑷姩2" + }, + { + "ID": "20250628173034155", + "Name": "w2status", + "Desc": "", + "Type": "System.UInt16", + "ShortType": "", + "MinVal": "", + "MaxVal": "", + "DefaultVal": "", + "MapDevice": "RGV", + "MapParam": "w2status", + "Map": "RGV.w2status", + "Queue": "RGVQueue", + "Converter": "", + "GroupID": "20250615174530321", + "GroupFullName": "Tag.RGV", + "FullName": "Tag.RGV.w2status" + }, + { + "ID": "20250628173034139", + "Name": "w1status", + "Desc": "", + "Type": "System.UInt16", + "ShortType": "", + "MinVal": "", + "MaxVal": "", + "DefaultVal": "", + "MapDevice": "RGV", + "MapParam": "w1status", + "Map": "RGV.w1status", + "Queue": "RGVQueue", + "Converter": "", + "GroupID": "20250615174530321", + "GroupFullName": "Tag.RGV", + "FullName": "Tag.RGV.w1status" } ], "Children": [] @@ -7520,7 +7556,7 @@ ] }, "CreationTime": "2025-02-26 15:31:23", - "LastWriteTime": "2025-06-28 14:27:08", + "LastWriteTime": "2025-06-28 17:30:37", "Sample": { "ID": "", "Name": "Tag", -- Gitblit v1.9.1