Quellcode durchsuchen

update querydata service

chenkui vor 3 Tagen
Ursprung
Commit
2e3e20ad79

+ 1 - 1
PunkHPX8_RT/Instances/RtInstance.cs

@@ -31,7 +31,7 @@ namespace PunkHPX8_RT.Modules
 
         public const string SystemName = "PunkHPX8";
 
-        public const string DatabaseName = "p300db";
+        public const string DatabaseName = "punkhpx8db";
 
         public const ushort ANALOG_TRANS_RANGE = 8000;
         public const string DeviceModelFileName = "DeviceModelVenus.xml";

+ 4 - 0
PunkHPX8_RT/Instances/ToolLoader.cs

@@ -51,6 +51,10 @@ namespace PunkHPX8_RT.Instances
         public void Initialize()
         {
             LogDefineManager.Initialize(PathManager.GetCfgDir() + "LogDefine.json");
+            WcfServiceManager.Instance.Initialize(new Type[]
+            {
+               typeof (RecipeService),typeof (QueryDataService)
+            });
             Singleton<ConfigManager>.Instance.Initialize();
 
             Singleton<DatabaseManager>.Instance.Initialize(

+ 0 - 3
PunkHPX8_Themes/UserControls/ProcessControl.xaml.cs

@@ -299,9 +299,6 @@ namespace PunkHPX8_Themes.UserControls
                 if (_rtDataValues != null)
                 {
                     _cellWaferHolderDictionary = CommonFunction.GetValue<ConcurrentDictionary<string, bool>>(_rtDataValues, "System.CellWaferHolderDictionary");
-                    LoaderTransoprterWaferHolderVisible = _cellWaferHolderDictionary[ModuleName.Transporter2.ToString()];
-                    ProcessTransoprterWaferHolderVisible = _cellWaferHolderDictionary[ModuleName.Transporter1.ToString()];
-                    
                     //判断Chanmber状态
                     foreach (DependencyObject child in totalCanvas.Children)
                     {

+ 0 - 6
PunkHPX8_UI/Config/UIMenu.json

@@ -31,12 +31,6 @@
 				"View": "FAView"
 			},
 			{
-				"Id": "WaferHolder",
-				"IsShow": "true",
-				"Name": "WaferShuttle",
-				"View": "WaferHolderView"
-			},
-			{
 				"Id": "MaterialMovement",
 				"IsShow": "true",
 				"Name": "MaterialMovement",

+ 4 - 0
PunkHPX8_UI/Views/ShellView.xaml.cs

@@ -472,6 +472,10 @@ namespace PunkHPX8_UI.Views
                     }
                     string viewClassName = $"PunkHPX8_MainPages.Views.{item.View}";
                     Type viewType = Type.GetType($"{viewClassName},PunkHPX8_MainPages");
+                    if (viewType == null)
+                    {
+                        continue;
+                    }
                     obj = System.Activator.CreateInstance(viewType);
                     _childrenTabDic[item.Id] = index;
                 }