配料系统调整修改

DosingSystem/App.xaml.cs

@@ -96,19 +96,19 @@ namespace BPASmartClient.DosingSystem
 
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "设备控制参数设置",
+                SubMenuName = "设备参数设置",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.DosingSystem",
                 ToggleWindowPath = "View.CommParSetView"
             });
 
-            ParSet.Add(new SubMenumodel()
-            {
-                SubMenuName = "出料口管理设置",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.DosingSystem",
-                ToggleWindowPath = "View.OutletManagementView"
-            });
+            //ParSet.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "出料口管理设置",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.DosingSystem",
+            //    ToggleWindowPath = "View.OutletManagementView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
@@ -186,13 +186,13 @@ namespace BPASmartClient.DosingSystem
                 ToggleWindowPath = "Pages.View.DebugLogView"
             });
 
-            InfoLog.Add(new SubMenumodel()
-            {
-                SubMenuName = "报表数据",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
-                AssemblyName = "BPASmartClient.CustomResource",
-                ToggleWindowPath = "Pages.View.ReportView"
-            });
+            //InfoLog.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "报表数据",
+            //    SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
+            //    AssemblyName = "BPASmartClient.CustomResource",
+            //    ToggleWindowPath = "Pages.View.ReportView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
@@ -255,13 +255,13 @@ namespace BPASmartClient.DosingSystem
                 ToggleWindowPath = "Pages.View.UserManagerView"
             });
 
-            UserManager.Add(new SubMenumodel()
-            {
-                SubMenuName = "NFC登录管理",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.CustomResource",
-                ToggleWindowPath = "Pages.View.NfcSetView"
-            });
+            //UserManager.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "NFC登录管理",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.CustomResource",
+            //    ToggleWindowPath = "Pages.View.NfcSetView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {

DosingSystem/Model/DeviceInquire.cs

@@ -114,7 +114,7 @@ namespace BPASmartClient.DosingSystem
         {
             if (!string.IsNullOrEmpty(Json<DevicePar>.Data.BaseParModel.NetworkSegAddress)) IPSegment = Json<DevicePar>.Data.BaseParModel.NetworkSegAddress;
             else Json<DevicePar>.Data.BaseParModel.NetworkSegAddress = IPSegment;
-            //TestData();
+            TestData();
             IpAddressLines();
             SiemensDevice.GetInstance.Connect(Json<DevicePar>.Data.BaseParModel.DeviceAddress);
             DeviceDataInit();

DosingSystem/View/RecipeSettingsView.xaml

@@ -65,14 +65,14 @@
                 IcoText=""
                 Style="{StaticResource IcoButtonStyle}" />-->
 
-            <Button
+            <!--<Button
                 Width="140"
                 Height="30"
                 Margin="10 0"
                 Command="{Binding NewMaterital}"
                 Content="新建原料"
                 FontSize="16"
-                Style="{StaticResource ImageButtonStyle}" />
+                Style="{StaticResource ImageButtonStyle}" />-->
 
             <Button
                 Width="140"