add thirdparty dll

Venus/Framework/Common/CommonData/HistoryDataItem.cs

@@ -172,8 +172,8 @@ namespace MECF.Framework.Common.CommonData
         public DateTime? ProcessStartTime { get; set; }
         [DataMember]
         public DateTime? ProcessEndTime { get; set; }
-        [DataMember]
-        public string LotID { get; set; }
+        //[DataMember]
+        //public string LotID { get; set; }
         [DataMember]
         public string SlotID { get; set; }
         public string ProcessDuration

Venus/Framework/Common/Routine/RoutineRunner.cs

@@ -5,11 +5,12 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Diagnostics;
 
+#pragma warning disable 0414
 namespace MECF.Framework.Common.Routine
 {
     public class RoutineRunner
     {
-        enum State
+        public enum State
         {
             Init,
             Running,
@@ -18,21 +19,22 @@ namespace MECF.Framework.Common.Routine
             Timeout,
         }
 
-        private State       _state = State.Init;
+        
         private State       _subState = State.Init;
         private Stack<int>  _step = new Stack<int>();
         private int         _curStep = int.MaxValue;
+        private State     _runnerState = State.Init;
 
         Stopwatch _subStepTimer = new Stopwatch();
 
         public RoutineRunner()
         {
-
+            _runnerState = State.Init;
         }
 
         public void Reset()
         {
-            _state = State.Init;
+            _runnerState = State.Init;
             _subState = State.Init;
             _step.Clear();
         }
@@ -41,7 +43,7 @@ namespace MECF.Framework.Common.Routine
         {
             if (!_step.Contains(id))
             {
-                _state = State.Running;
+                _runnerState = State.Running;
                 startNewStep(id, action);
             }
             else
@@ -56,7 +58,7 @@ namespace MECF.Framework.Common.Routine
                     {
                         if (_subStepTimer.ElapsedMilliseconds > timeout)
                         {
-                            _state = State.Failed;
+                            _runnerState = State.Failed;
                             _subState = State.Timeout;
                         }
                     }
@@ -70,7 +72,7 @@ namespace MECF.Framework.Common.Routine
         {
             if (!_step.Contains(id))
             {
-                _state = State.Running;
+                _runnerState = State.Running;
                 startNewStep(id, action);
             }
             else
@@ -101,7 +103,7 @@ namespace MECF.Framework.Common.Routine
                 {
                     if (_subStepTimer.ElapsedMilliseconds > timeout)
                     {
-                        _state = State.Failed;
+                        _runnerState = State.Failed;
                         _subState = State.Timeout;
                     }
                 }
@@ -137,14 +139,14 @@ namespace MECF.Framework.Common.Routine
             {
                 if (condition())
                 {
-                    _state = State.End;
+                    _runnerState = State.End;
                     _subState = State.End;
                 }
                 else
                 {
                     if (_subStepTimer.ElapsedMilliseconds > timeout)
                     {
-                        _state = State.Failed;
+                        _runnerState = State.Failed;
                         _subState = State.Timeout;
                     }
                 }
@@ -163,7 +165,7 @@ namespace MECF.Framework.Common.Routine
             {
                 if (_subStepTimer.ElapsedMilliseconds > timeout)
                 {
-                    _state = State.End;
+                    _runnerState = State.End;
                     _subState = State.End;
                 }
             }
@@ -182,7 +184,7 @@ namespace MECF.Framework.Common.Routine
             }
             else
             {
-                _state = State.Failed;
+                _runnerState = State.Failed;
             }
         }
     }

Venus/RecipeEditorControl/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Aitex.Ui.RecipeEditor.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace Aitex.Ui.RecipeEditor.Properties {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

Venus/RecipeEditorControl/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace Aitex.Ui.RecipeEditor.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

Venus/RecipeEditorControl/RecipeEditorControl.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Aitex.Ui.RecipeEditor</RootNamespace>
     <AssemblyName>RecipeEditorControl</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -47,19 +47,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EPDViewerLib">
-      <HintPath>..\ThirdParty\dlls\epdviewer\EPDViewerLib.dll</HintPath>
+      <HintPath>..\ThirdParty\EpdViewerLib.dll</HintPath>
     </Reference>
     <Reference Include="ExcelLibrary">
-      <HintPath>..\ThirdParty\dlls\ExcelLibrary.dll</HintPath>
+      <HintPath>..\ThirdParty\ExcelLibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenSEMI.Core">
+      <HintPath>..\ThirdParty\OpenSEMI.Core.dll</HintPath>
     </Reference>
     <Reference Include="OpenSEMI.Ctrlib">
-      <HintPath>..\ThirdParty\dlls\selfbuild\OpenSEMI.Ctrlib.dll</HintPath>
+      <HintPath>..\ThirdParty\OpenSEMI.Ctrlib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Interactivity">
-      <HintPath>..\ThirdParty\dlls\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\ThirdParty\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -73,16 +76,16 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Xceed.Wpf.AvalonDock">
-      <HintPath>..\ThirdParty\dlls\Xceed.Wpf.AvalonDock.dll</HintPath>
+      <HintPath>..\ThirdParty\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
     <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero">
-      <HintPath>..\ThirdParty\dlls\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+      <HintPath>..\ThirdParty\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
     <Reference Include="Xceed.Wpf.DataGrid">
-      <HintPath>..\ThirdParty\dlls\Xceed.Wpf.DataGrid.dll</HintPath>
+      <HintPath>..\ThirdParty\Xceed.Wpf.DataGrid.dll</HintPath>
     </Reference>
     <Reference Include="Xceed.Wpf.Toolkit">
-      <HintPath>..\ThirdParty\dlls\Xceed.Wpf.Toolkit.dll</HintPath>
+      <HintPath>..\ThirdParty\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Venus/Venus.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32630.192
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32630.194
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Venus_UI", "Venus_UI\Venus_UI.csproj", "{A3CB74E2-00F1-4F24-A4DA-9630713CE8E5}"
 EndProject
@@ -13,6 +13,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Venus_Core", "Venus_Core\Ve
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Venus_RT", "Venus_RT\Venus_RT.csproj", "{B7BCE223-9D3F-42A3-9D6E-49AB27BA5749}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{216B7F90-8D9C-475B-8000-22C2727DB1A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Framework\Common\Common.csproj", "{9CD2A6BE-1971-4E74-B49E-547982F64034}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTCore", "Framework\RTCore\RTCore.csproj", "{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTEquipmentLibrary", "Framework\RTEquipmentLibrary\RTEquipmentLibrary.csproj", "{090A1E9C-1087-4C8A-B4E0-FF074459E071}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTModuleLibrary", "Framework\RTModuleLibrary\RTModuleLibrary.csproj", "{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimulatorCore", "Framework\SimulatorCore\SimulatorCore.csproj", "{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UICore", "Framework\UICore\UICore.csproj", "{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecipeEditorControl", "RecipeEditorControl\RecipeEditorControl.csproj", "{C226E370-E9FB-48E7-BF40-89A33F88EF17}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,10 +55,46 @@ Global
 		{B7BCE223-9D3F-42A3-9D6E-49AB27BA5749}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7BCE223-9D3F-42A3-9D6E-49AB27BA5749}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7BCE223-9D3F-42A3-9D6E-49AB27BA5749}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CD2A6BE-1971-4E74-B49E-547982F64034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CD2A6BE-1971-4E74-B49E-547982F64034}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CD2A6BE-1971-4E74-B49E-547982F64034}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CD2A6BE-1971-4E74-B49E-547982F64034}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{090A1E9C-1087-4C8A-B4E0-FF074459E071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{090A1E9C-1087-4C8A-B4E0-FF074459E071}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{090A1E9C-1087-4C8A-B4E0-FF074459E071}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{090A1E9C-1087-4C8A-B4E0-FF074459E071}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C226E370-E9FB-48E7-BF40-89A33F88EF17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C226E370-E9FB-48E7-BF40-89A33F88EF17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C226E370-E9FB-48E7-BF40-89A33F88EF17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C226E370-E9FB-48E7-BF40-89A33F88EF17}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9CD2A6BE-1971-4E74-B49E-547982F64034} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+		{BCBD839A-C9A0-4BE7-98CA-B0A88AD38E5A} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+		{090A1E9C-1087-4C8A-B4E0-FF074459E071} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+		{7C395751-ABE6-4B5B-8F3A-BDA0FCE08F6C} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+		{EBE55E3F-6DCE-47B9-AC61-54A8B9B3482A} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+		{2C9E1DF3-1ABA-4972-BE60-41DD9B3C47A7} = {216B7F90-8D9C-475B-8000-22C2727DB1A5}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EBAC36B-30D3-404A-84A9-E4020541E38A}
 	EndGlobalSection