From a5f4bf474fddbc129708f4ddb92eaaafc6ff1f73 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 22 十一月 2022 17:33:18 +0800
Subject: [PATCH] 金庭电磁仪对接 未完成

---
 IStation.Server.SZJTKT.sln |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/IStation.Server.SZJTKT.sln b/IStation.Server.SZJTKT.sln
index f59b094..dcdc594 100644
--- a/IStation.Server.SZJTKT.sln
+++ b/IStation.Server.SZJTKT.sln
@@ -29,10 +29,6 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.DataDockingSocket4SZJT_KT", "Socket\IStation.DataDockingSocket4SZJT_KT\IStation.DataDockingSocket4SZJT_KT.csproj", "{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server.SZJTKT", "Server\IStation.DataDocking.Socket.Custom\IStation.Server.SZJTKT.csproj", "{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf.SZJTKT", "TopShelf\IStation.TopShelf.DataDocking.Socket.Custom\IStation.TopShelf.SZJTKT.csproj", "{EE97C373-86B6-4D5B-A053-CFEE9DE45555}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Run", "Model\IStation.Model.Run\IStation.Model.Run.csproj", "{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Core", "Model\IStation.Model.Core\IStation.Model.Core.csproj", "{58A935E7-A5F1-43B6-8932-4063D1892FD4}"
@@ -42,6 +38,10 @@
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.Monitor", "Model\IStation.Model.Monitor\IStation.Model.Monitor.csproj", "{5C74A158-6503-4305-BA58-43A8E7711139}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Formula", "Untity\IStation.Formula\IStation.Formula.csproj", "{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Server.SZJTKT", "Server\IStation.Server.SZJTKT\IStation.Server.SZJTKT.csproj", "{C6E08684-0E1B-4783-8B3F-7B333098B788}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf.SZJTKT", "TopShelf\IStation.TopShelf.SZJTKT\IStation.TopShelf.SZJTKT.csproj", "{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -81,14 +81,6 @@
 		{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CC5E54B-495E-4E77-8F59-BC9875AAF09C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE97C373-86B6-4D5B-A053-CFEE9DE45555}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -109,6 +101,14 @@
 		{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6E08684-0E1B-4783-8B3F-7B333098B788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6E08684-0E1B-4783-8B3F-7B333098B788}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6E08684-0E1B-4783-8B3F-7B333098B788}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6E08684-0E1B-4783-8B3F-7B333098B788}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBA3756A-AB9A-4EA6-B871-D0060AD62A11}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -122,12 +122,12 @@
 		{B0F57862-6EFF-4546-940F-EED345588C88} = {36FC868C-301C-4E8F-91F6-5C2CF36C089F}
 		{4824999B-DB39-469E-A45F-A021E91517B1} = {36FC868C-301C-4E8F-91F6-5C2CF36C089F}
 		{52EB70CF-DA75-4B9A-9518-FAB3C6B2C840} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
-		{6CC5E54B-495E-4E77-8F59-BC9875AAF09C} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
 		{79C5FFCE-32DD-43D1-9FC9-02C58AFC9A61} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
 		{58A935E7-A5F1-43B6-8932-4063D1892FD4} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
 		{41FA816A-D61C-4912-9AC8-A7F721945D10} = {0ACD3DC5-555C-4AF8-A6FF-677019D0F25C}
 		{5C74A158-6503-4305-BA58-43A8E7711139} = {3C84D9C3-0D7A-4FA8-A978-99491A0387C4}
 		{D3BF9B4C-6444-4D88-ACB6-4D8F7D39BEC7} = {0ACD3DC5-555C-4AF8-A6FF-677019D0F25C}
+		{C6E08684-0E1B-4783-8B3F-7B333098B788} = {02459ECE-F0E1-4DE9-91ED-6BCA74A832E0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

--
Gitblit v1.9.3