Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration

BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj

@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.112" />
-    <PackageReference Include="BPA.Helper" Version="1.0.73" />
+    <PackageReference Include="BPA.Helper" Version="1.0.75" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.Tourism/BPASmartClient.MorkCL.csproj

@@ -15,7 +15,6 @@
     <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
     <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
-    <ProjectReference Include="..\BPASmartClient.MORKSM.BK.PLC\BPASmartClient.PLC.csproj" />
   </ItemGroup>
 
   <ItemGroup>

DosingSystem/BPASmartClient.DosingSystem.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.113" />
+    <PackageReference Include="BPA.Communication" Version="1.0.114" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

SmartClient.sln

@@ -144,8 +144,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTest", "WpfTest\WpfTest.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMW", "BPASmartClient.MorkMW\BPASmartClient.MorkMW.csproj", "{C763BF70-2416-4A64-9011-8EF8549473FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DosingSystemSingle", "BPASmartClient.DosingSystemSingle\BPASmartClient.DosingSystemSingle.csproj", "{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "设备监控", "设备监控", "{106E84C1-CAC5-4F14-9E31-201D3202C9FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MaxWokControl", "BPASmartClient.MaxWokControl\BPASmartClient.MaxWokControl.csproj", "{888382C0-6750-4E81-BED3-0F38775DCCCB}"
@@ -164,7 +162,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMV1", "B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.FoodStationTest", "BPASmartClient.FoodStationTest\BPASmartClient.FoodStationTest.csproj", "{82D5C479-7C38-41D6-8B42-24D4EC32D94F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkCL", "BPASmartClient.Tourism\BPASmartClient.MorkCL.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkCL", "BPASmartClient.Tourism\BPASmartClient.MorkCL.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1360,26 +1358,6 @@ Global
 		{C763BF70-2416-4A64-9011-8EF8549473FD}.Release|x64.Build.0 = Release|Any CPU
 		{C763BF70-2416-4A64-9011-8EF8549473FD}.Release|x86.ActiveCfg = Release|Any CPU
 		{C763BF70-2416-4A64-9011-8EF8549473FD}.Release|x86.Build.0 = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|ARM.Build.0 = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|ARM64.Build.0 = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x64.Build.0 = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5}.Release|x86.Build.0 = Release|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{888382C0-6750-4E81-BED3-0F38775DCCCB}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1626,7 +1604,6 @@ Global
 		{798BBFFE-3BA2-40BA-BFE1-9502398F1F08} = {C6984F48-A0FE-47A4-B63B-E4E5BCFCD6D3}
 		{CD43FABA-D1ED-4524-AC51-60ECDE2EAD44} = {7BE13E55-D8B1-4232-AE63-8BF122633297}
 		{C763BF70-2416-4A64-9011-8EF8549473FD} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
-		{B79914B9-3A81-426B-88FF-8ABAF5C92AB5} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
 		{106E84C1-CAC5-4F14-9E31-201D3202C9FD} = {7BE13E55-D8B1-4232-AE63-8BF122633297}
 		{888382C0-6750-4E81-BED3-0F38775DCCCB} = {106E84C1-CAC5-4F14-9E31-201D3202C9FD}
 		{C467ACE0-1BB4-44F0-9B5E-AFFFB58846D3} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}