diff --git a/BPASmartClient.Tourism/Alarm.cs b/BPASmartClient.Tourism/Alarm.cs index 4f0b1753..bb637dae 100644 --- a/BPASmartClient.Tourism/Alarm.cs +++ b/BPASmartClient.Tourism/Alarm.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege +namespace BPASmartClient.MorkCL { public class Alarm : IAlarm { diff --git a/BPASmartClient.Tourism/BPASmartClient.TourismCollege.csproj b/BPASmartClient.Tourism/BPASmartClient.MorkCL.csproj similarity index 100% rename from BPASmartClient.Tourism/BPASmartClient.TourismCollege.csproj rename to BPASmartClient.Tourism/BPASmartClient.MorkCL.csproj diff --git a/BPASmartClient.Tourism/Control_MorkCL.cs b/BPASmartClient.Tourism/Control_MorkCL.cs index a0a46d47..7832feac 100644 --- a/BPASmartClient.Tourism/Control_MorkCL.cs +++ b/BPASmartClient.Tourism/Control_MorkCL.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege +namespace BPASmartClient.MorkCL { public class Control_MorkCL : BaseDevice { @@ -22,12 +22,12 @@ namespace BPASmartClient.TourismCollege public override void MainTask() { - throw new NotImplementedException(); + //throw new NotImplementedException(); } public override void ReadData() { - throw new NotImplementedException(); + //throw new NotImplementedException(); } public override void ResetProgram() diff --git a/BPASmartClient.Tourism/GVL_MorkCL.cs b/BPASmartClient.Tourism/GVL_MorkCL.cs index e07f8ec1..8bd69a5d 100644 --- a/BPASmartClient.Tourism/GVL_MorkCL.cs +++ b/BPASmartClient.Tourism/GVL_MorkCL.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege +namespace BPASmartClient.MorkCL { public class GVL_MorkCL : IStatus { diff --git a/BPASmartClient.Tourism/GlobalUsing.cs b/BPASmartClient.Tourism/GlobalUsing.cs index 70a9ebe6..9621b22c 100644 --- a/BPASmartClient.Tourism/GlobalUsing.cs +++ b/BPASmartClient.Tourism/GlobalUsing.cs @@ -7,9 +7,9 @@ global using BPA.Communication; global using BPA.Helper; global using BPASmartClient.Business; global using BPASmartClient.CustomResource; -global using BPASmartClient.TourismCollege.View; -global using BPASmartClient.TourismCollege.ViewModel; -global using BPASmartClient.TourismCollege.Model; +global using BPASmartClient.MorkCL.View; +global using BPASmartClient.MorkCL.ViewModel; +global using BPASmartClient.MorkCL.Model; global using System.Collections.Concurrent; global using System.Collections.ObjectModel; global using BPASmartClient.Device; diff --git a/BPASmartClient.Tourism/Model/AccessoriesInfo.cs b/BPASmartClient.Tourism/Model/AccessoriesInfo.cs index 49de52dd..93e6ef5a 100644 --- a/BPASmartClient.Tourism/Model/AccessoriesInfo.cs +++ b/BPASmartClient.Tourism/Model/AccessoriesInfo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { /// /// 辅料信息 diff --git a/BPASmartClient.Tourism/Model/ControlData.cs b/BPASmartClient.Tourism/Model/ControlData.cs index e11228dc..a2eff3fc 100644 --- a/BPASmartClient.Tourism/Model/ControlData.cs +++ b/BPASmartClient.Tourism/Model/ControlData.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { internal class ControlData { diff --git a/BPASmartClient.Tourism/Model/EFunc.cs b/BPASmartClient.Tourism/Model/EFunc.cs index 2adcd941..c3dab0b7 100644 --- a/BPASmartClient.Tourism/Model/EFunc.cs +++ b/BPASmartClient.Tourism/Model/EFunc.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { /// /// 功能枚举列表 diff --git a/BPASmartClient.Tourism/Model/FuncPar.cs b/BPASmartClient.Tourism/Model/FuncPar.cs index 62882b9d..a6736ed5 100644 --- a/BPASmartClient.Tourism/Model/FuncPar.cs +++ b/BPASmartClient.Tourism/Model/FuncPar.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { /// /// 功能参数信息 diff --git a/BPASmartClient.Tourism/Model/IngredientsInfo.cs b/BPASmartClient.Tourism/Model/IngredientsInfo.cs index 350393b7..2b0d4e98 100644 --- a/BPASmartClient.Tourism/Model/IngredientsInfo.cs +++ b/BPASmartClient.Tourism/Model/IngredientsInfo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { /// /// 主料信息 diff --git a/BPASmartClient.Tourism/Model/InitData.cs b/BPASmartClient.Tourism/Model/InitData.cs index c635c9c8..1c9c8196 100644 --- a/BPASmartClient.Tourism/Model/InitData.cs +++ b/BPASmartClient.Tourism/Model/InitData.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { internal class InitData { diff --git a/BPASmartClient.Tourism/Model/RawMaterial.cs b/BPASmartClient.Tourism/Model/RawMaterial.cs index 9140cf10..ed4d274c 100644 --- a/BPASmartClient.Tourism/Model/RawMaterial.cs +++ b/BPASmartClient.Tourism/Model/RawMaterial.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { public class RawMaterial : NotifyBase { diff --git a/BPASmartClient.Tourism/Model/SeasoningInfo.cs b/BPASmartClient.Tourism/Model/SeasoningInfo.cs index 4e513fcd..eff800e7 100644 --- a/BPASmartClient.Tourism/Model/SeasoningInfo.cs +++ b/BPASmartClient.Tourism/Model/SeasoningInfo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Model +namespace BPASmartClient.MorkCL.Model { /// /// 调料信息 diff --git a/BPASmartClient.Tourism/Server/DeviceControl.cs b/BPASmartClient.Tourism/Server/DeviceControl.cs index a11c5b52..413cba76 100644 --- a/BPASmartClient.Tourism/Server/DeviceControl.cs +++ b/BPASmartClient.Tourism/Server/DeviceControl.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { /// /// 设备控制类 diff --git a/BPASmartClient.Tourism/Server/FryingPanServer.cs b/BPASmartClient.Tourism/Server/FryingPanServer.cs index 2b20ce1f..02dc5eb1 100644 --- a/BPASmartClient.Tourism/Server/FryingPanServer.cs +++ b/BPASmartClient.Tourism/Server/FryingPanServer.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { /// /// 炒锅服务类 diff --git a/BPASmartClient.Tourism/Server/IServer.cs b/BPASmartClient.Tourism/Server/IServer.cs index b615a160..07cf537e 100644 --- a/BPASmartClient.Tourism/Server/IServer.cs +++ b/BPASmartClient.Tourism/Server/IServer.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { internal interface IServer { diff --git a/BPASmartClient.Tourism/Server/ModbusTcpBase.cs b/BPASmartClient.Tourism/Server/ModbusTcpBase.cs index d35090a9..4f79f8f7 100644 --- a/BPASmartClient.Tourism/Server/ModbusTcpBase.cs +++ b/BPASmartClient.Tourism/Server/ModbusTcpBase.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { internal abstract class ModbusTcpBase { diff --git a/BPASmartClient.Tourism/Server/OtherServer.cs b/BPASmartClient.Tourism/Server/OtherServer.cs index fe3c8dc5..f4e1963a 100644 --- a/BPASmartClient.Tourism/Server/OtherServer.cs +++ b/BPASmartClient.Tourism/Server/OtherServer.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { /// /// 其它服务类 diff --git a/BPASmartClient.Tourism/Server/PressureCookerServer.cs b/BPASmartClient.Tourism/Server/PressureCookerServer.cs index 2d8f48f8..c62fc515 100644 --- a/BPASmartClient.Tourism/Server/PressureCookerServer.cs +++ b/BPASmartClient.Tourism/Server/PressureCookerServer.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { /// /// 压力锅服务类 diff --git a/BPASmartClient.Tourism/Server/RobotServer.cs b/BPASmartClient.Tourism/Server/RobotServer.cs index 95df6025..e394d688 100644 --- a/BPASmartClient.Tourism/Server/RobotServer.cs +++ b/BPASmartClient.Tourism/Server/RobotServer.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Server +namespace BPASmartClient.MorkCL.Server { /// /// 机器人服务类 diff --git a/BPASmartClient.Tourism/View/AddRawMaterialView.xaml b/BPASmartClient.Tourism/View/AddRawMaterialView.xaml index 59cd04b0..8a6c8159 100644 --- a/BPASmartClient.Tourism/View/AddRawMaterialView.xaml +++ b/BPASmartClient.Tourism/View/AddRawMaterialView.xaml @@ -1,11 +1,11 @@  diff --git a/BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs b/BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs index 08188257..ab4e0278 100644 --- a/BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs +++ b/BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace BPASmartClient.TourismCollege.View +namespace BPASmartClient.MorkCL.View { /// /// AddRawMaterialView.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/View/Debug.xaml b/BPASmartClient.Tourism/View/Debug.xaml index c4bc0d83..7d3bb6e1 100644 --- a/BPASmartClient.Tourism/View/Debug.xaml +++ b/BPASmartClient.Tourism/View/Debug.xaml @@ -1,9 +1,9 @@ - diff --git a/BPASmartClient.Tourism/View/Debug.xaml.cs b/BPASmartClient.Tourism/View/Debug.xaml.cs index ec21b964..f71c0a8c 100644 --- a/BPASmartClient.Tourism/View/Debug.xaml.cs +++ b/BPASmartClient.Tourism/View/Debug.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace BPASmartClient.TourismCollege.View +namespace BPASmartClient.MorkCL.View { /// /// Debug.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/View/ItemStorageView.xaml b/BPASmartClient.Tourism/View/ItemStorageView.xaml index 1012a498..6a4966b8 100644 --- a/BPASmartClient.Tourism/View/ItemStorageView.xaml +++ b/BPASmartClient.Tourism/View/ItemStorageView.xaml @@ -1,9 +1,9 @@  /// ItemStorageView.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/View/Monitor.xaml b/BPASmartClient.Tourism/View/Monitor.xaml index eebe0463..6e1886f7 100644 --- a/BPASmartClient.Tourism/View/Monitor.xaml +++ b/BPASmartClient.Tourism/View/Monitor.xaml @@ -1,11 +1,11 @@  /// Monitor.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/View/ParSet.xaml b/BPASmartClient.Tourism/View/ParSet.xaml index d26c9caa..4fffab36 100644 --- a/BPASmartClient.Tourism/View/ParSet.xaml +++ b/BPASmartClient.Tourism/View/ParSet.xaml @@ -1,9 +1,9 @@  /// ParSer.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/View/RecipeManageView.xaml b/BPASmartClient.Tourism/View/RecipeManageView.xaml index ff14a616..88e2f311 100644 --- a/BPASmartClient.Tourism/View/RecipeManageView.xaml +++ b/BPASmartClient.Tourism/View/RecipeManageView.xaml @@ -1,9 +1,9 @@  /// RecipeManageView.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs b/BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs index 9289f34b..4718146d 100644 --- a/BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.ViewModel +namespace BPASmartClient.MorkCL.ViewModel { public class AddRawMaterialViewModel:NotifyBase { diff --git a/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs b/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs index a1206f30..4eea3711 100644 --- a/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.ViewModel +namespace BPASmartClient.MorkCL.ViewModel { internal class ItemStorageViewModel { diff --git a/BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs b/BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs index d0108925..76f0ec37 100644 --- a/BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.ViewModel +namespace BPASmartClient.MorkCL.ViewModel { public class MonitorViewModel { diff --git a/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs b/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs index dfe24f7d..9785074a 100644 --- a/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.ViewModel +namespace BPASmartClient.MorkCL.ViewModel { public class RecipeManageViewModel { diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj index fddb052c..29536f58 100644 --- a/BPASmartClient/BPASmartClient.csproj +++ b/BPASmartClient/BPASmartClient.csproj @@ -45,7 +45,7 @@ - + diff --git a/SmartClient.sln b/SmartClient.sln index c18fa241..761ec867 100644 --- a/SmartClient.sln +++ b/SmartClient.sln @@ -164,7 +164,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.TourismCollege", "BPASmartClient.Tourism\BPASmartClient.TourismCollege.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkCL", "BPASmartClient.Tourism\BPASmartClient.MorkCL.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution