Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer

.editorconfig

@@ -0,0 +1,247 @@
+# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
+root = true
+
+# c# 文件
+[*.cs]
+
+#### Core EditorConfig 选项 ####
+
+# 缩进和间距
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# 新行首选项
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET 代码操作 ####
+
+# 类型成员
+dotnet_hide_advanced_members = false
+dotnet_member_insertion_location = with_other_members_of_the_same_kind
+dotnet_property_generation_behavior = prefer_throwing_properties
+
+# 符号搜索
+dotnet_search_reference_assemblies = true
+
+#### .NET 编码约定 ####
+
+# 组织 Using
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this. 和 Me. 首选项
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# 语言关键字与 bcl 类型首选项
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# 括号首选项
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# 修饰符首选项
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# 表达式级首选项
+dotnet_prefer_system_hash_code = true
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# 字段首选项
+dotnet_style_readonly_field = true
+
+# 参数首选项
+dotnet_code_quality_unused_parameters = all
+
+# 禁止显示首选项
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# 新行首选项
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### c# 编码约定 ####
+
+# var 首选项
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Expression-bodied 成员
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# 模式匹配首选项
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true
+
+# Null 检查首选项
+csharp_style_conditional_delegate_call = true
+
+# 修饰符首选项
+csharp_prefer_static_anonymous_function = true
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true
+csharp_style_prefer_readonly_struct_member = true
+
+# 代码块首选项
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = true
+csharp_prefer_system_threading_lock = true
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_primary_constructors = true
+csharp_style_prefer_simple_property_accessors = true
+csharp_style_prefer_top_level_statements = true
+
+# 表达式级首选项
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_implicitly_typed_lambda_expression = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_unbound_generic_type_in_nameof = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# "using" 指令首选项
+csharp_using_directive_placement = outside_namespace
+
+# 新行首选项
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C# 格式规则 ####
+
+# 新行首选项
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# 缩进首选项
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# 空格键首选项
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# 包装首选项
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

DATA/DyeingComputer.ini

@@ -0,0 +1,4 @@
+[SYS]
+COM=COM7
+Language=zh-CN
+Protocols=SUNLIGHT_R

DyeingComputer.csproj

@@ -33,7 +33,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -80,6 +80,11 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup />
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -349,6 +354,8 @@
       <LastGenOutput>Resources.zh-TW.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Resource Include="Fonts\FontAwesome.otf" />
+    <None Include=".editorconfig" />
+    <None Include="app.manifest" />
     <None Include="DATA\800COMPUTER.db" />
     <None Include="DATA\Chart.db" />
     <None Include="DATA\LOG.db" />
@@ -386,6 +393,7 @@
     <None Include="Fonts\font-awesome-4.7.0\scss\_screen-reader.scss" />
     <None Include="Fonts\font-awesome-4.7.0\scss\_stacked.scss" />
     <None Include="Fonts\font-awesome-4.7.0\scss\_variables.scss" />
+    <None Include="Properties\.editorconfig" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Properties/.editorconfig

@@ -0,0 +1,247 @@
+# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
+root = true
+
+# c# 文件
+[*.cs]
+
+#### Core EditorConfig 选项 ####
+
+# 缩进和间距
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# 新行首选项
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET 代码操作 ####
+
+# 类型成员
+dotnet_hide_advanced_members = false
+dotnet_member_insertion_location = with_other_members_of_the_same_kind
+dotnet_property_generation_behavior = prefer_throwing_properties
+
+# 符号搜索
+dotnet_search_reference_assemblies = true
+
+#### .NET 编码约定 ####
+
+# 组织 Using
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this. 和 Me. 首选项
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# 语言关键字与 bcl 类型首选项
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# 括号首选项
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# 修饰符首选项
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# 表达式级首选项
+dotnet_prefer_system_hash_code = true
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# 字段首选项
+dotnet_style_readonly_field = true
+
+# 参数首选项
+dotnet_code_quality_unused_parameters = all
+
+# 禁止显示首选项
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# 新行首选项
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### c# 编码约定 ####
+
+# var 首选项
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Expression-bodied 成员
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# 模式匹配首选项
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true
+
+# Null 检查首选项
+csharp_style_conditional_delegate_call = true
+
+# 修饰符首选项
+csharp_prefer_static_anonymous_function = true
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true
+csharp_style_prefer_readonly_struct_member = true
+
+# 代码块首选项
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = true
+csharp_prefer_system_threading_lock = true
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_primary_constructors = true
+csharp_style_prefer_simple_property_accessors = true
+csharp_style_prefer_top_level_statements = true
+
+# 表达式级首选项
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_implicitly_typed_lambda_expression = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_unbound_generic_type_in_nameof = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# "using" 指令首选项
+csharp_using_directive_placement = outside_namespace
+
+# 新行首选项
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C# 格式规则 ####
+
+# 新行首选项
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# 缩进首选项
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# 空格键首选项
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# 包装首选项
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

UserClass/AsyncTcpServer.cs

@@ -74,6 +74,7 @@ namespace DyeingComputer.UserClass
       //  public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
         public static async Task Main()
         {
+            NetFwManger.AllowPort(7789, "TCP");//开放7790端口
             NetFwManger.AllowPort(7790,"TCP");//开放7790端口
             TcpService service = new TcpService();
             service.Connecting = (client, e) => { return EasyTask.CompletedTask; };//有客户端正在连接
@@ -110,29 +111,23 @@ namespace DyeingComputer.UserClass
                             Dictionary<string, object> WorkOrder_dat;
                             WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
                             //WorkOrder_dat.GetValue("WorkOrder");
-                            bool dat_w = SQLDATA.WorkOrder(
+
-                                WorkOrder_dat.GetValue("WorkOrder").ToString(),
+                            object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null);
-                                WorkOrder_dat.GetValue("ProgramName").ToString(),
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
-                                WorkOrder_dat.GetValue("StartTime").ToString(),
+                            Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString());
-                                WorkOrder_dat.GetValue("EndTime").ToString(),
+                            Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString());
-                                WorkOrder_dat.GetValue("Time").ToString(),
+                            if (i != null)
-                                WorkOrder_dat.GetValue("Remark").ToString(),
-                                WorkOrder_dat.GetValue("lock").ToString(),
-                                WorkOrder_dat.GetValue("State").ToString(),
-                                WorkOrder_dat.GetValue("ProgramID").ToString(),
-                                WorkOrder_dat.GetValue("color").ToString(),
-                                WorkOrder_dat.GetValue("Dyelot").ToString());
-                            if (!dat_w)
                             {
-                                client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" +
+                                client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
-                                WorkOrder_dat.GetValue("WorkOrder").ToString());
                             }
                             else
                             {
-                                client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" +
+                                client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
-                                WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++;
+                                MainWindowViewModel.TX++;
                             }
 
+                            MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
+
                             APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
                         }
                         catch (Exception ex)
@@ -151,15 +146,16 @@ namespace DyeingComputer.UserClass
                             DataTable WorkOrder_dat;
                             WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<DataTable>(SYSDAT);
                             bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat);
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
+                            Step_new.Add("WorkOrder", WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
+                            Step_new.Add("ReDye", WorkOrder_dat.Select().First().Field<object>("ReDye"));
                             if (!dat_w)
                             {
-                                client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" +
+                                client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
-                                WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
                             }
                             else
                             {
-                                client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" +
+                                client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
-                                WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
                                 MainWindowViewModel.TX++;
                             }
                             APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
@@ -180,6 +176,12 @@ namespace DyeingComputer.UserClass
                             Dictionary<string, object> WorkOrder_dat;
                             WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
                             MainWindow.SQLiteHelpers.InsertData("WorkorderSet", WorkOrder_dat);//行插入
+
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
+                            Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString());
+                            Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString());
+
+                            client.SendAsync("SC812" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
                             MainWindowViewModel.TX++;
                             APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
                         }
@@ -248,7 +250,7 @@ namespace DyeingComputer.UserClass
                             dat_821 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
                             if (dat_821.GetValue("INSTRUCTION").ToString() == "START")
                             {
-                                MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" +
+                                MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where ReDye=0 AND WorkOrder = '" +
                                     dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0];
                                 var DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" +
                                     dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0].Rows[0];
@@ -267,29 +269,61 @@ namespace DyeingComputer.UserClass
                                 MainWindowViewModel.Updata_dtm("1039", DT_Set.Field<int>("ClothWheel"));
                                 MainWindowViewModel.Updata_dtm("1040", DT_Set.Field<int>("ClothWheel"));
                                 MainWindowViewModel.Updata_dtm("1041", DT_Set.Field<int>("ClothWheel"));
+                                DataTable WorkorderSteps = MainWindow.SQLiteHelpers.ExecuteDataSet(
+                                    "select * from WorkorderSteps where ReDye=0 AND WorkOrder='" + dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0];  //读取表写入缓存                               
+                                DataTable Workorder = MainWindow.SQLiteHelpers.ExecuteDataSet(
+                                   "select * from Workorder where ReDye=0 AND WorkOrder='" + dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0];  //读取表写入缓存                               
+                                MainWindowViewModel.ProgramName = Workorder.Rows[0].Field<string>("ProgramName");
+                                MainWindowViewModel.WorkNumder = Workorder.Rows[0].Field<string>("WorkOrder");
+                                MainWindow.SQLiteHelpers.Delete("RUN", null, null); //删除run信息          
+                                for (int i = 0; i < WorkorderSteps.Rows.Count; i++)
+                                {
+                                    DataRow dr = WorkorderSteps.Rows[i];//行转
 
+                                    MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dr));//行插入
+                                }
+                                Dictionary<string, object> updata_temp = new Dictionary<string, object>();//缓存函数                                                   
+                                updata_temp.Add("State", 205);
+                                MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + dat_821.GetValue("WorkOrder").ToString() + "'", null);
+                                updata_temp.Clear(); //使用前清缓存  
+                                updata_temp.Add("RUN", 1);
+                                MainWindow.SQLiteHelpers.Update("RUN", updata_temp, "Step=1", null);
+                                //SQLiteHelpers.Close();  //关闭连接
+
+                                /*触发启动*/
+                                string Numder = WorkorderSteps.Select("Step = 1").First().Field<string>("StepID");//
+                                double P1 = WorkorderSteps.Select("Step = 1").First().Field<double>("Parameter1");
+                                double P2 = WorkorderSteps.Select("Step = 1").First().Field<double>("Parameter2");
+                                double P3 = WorkorderSteps.Select("Step = 1").First().Field<double>("Parameter3");
+                                double P4 = WorkorderSteps.Select("Step = 1").First().Field<double>("Parameter4");
+                                double P5 = WorkorderSteps.Select("Step = 1").First().Field<double>("Parameter5");
+                                MainWindowViewModel.RUN_STEPID = Convert.ToInt16(1);//插入步骤号                             
+                                MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3),
+                                    Convert.ToDouble(P4), Convert.ToDouble(P5));
+                                MainWindowViewModel.WORK_RUN = 2;
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "START", "STEP = " +
+                                    MainWindowViewModel.RUN_STEPID + ";StepID=" + Numder + ";P1=" + P1 + ";P2=" + P2 + ";P3=" + P3 + ";P4=" + P4 + ";P5=" + P5);
                                 client.SendAsync("SC821" + SYSKEY + SYSDAT);
                             }
                             else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP")
                             {
                                 MainWindowViewModel.WORK_RUN = 0;//停止
                                 MainWindowViewModel.DIDETime = 0;
-
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "STOP", MainWindowViewModel.WorkNumder.ToString());
                                 client.SendAsync("SC821" + SYSKEY + SYSDAT);
-                            }
+                            }//停止
                             else if (dat_821.GetValue("INSTRUCTION").ToString() == "PAUSE")
                             {
                                 MainWindowViewModel.WORK_RUN = 1;//暂停
                                 MainWindowViewModel.errTabler.Clear();
-
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "PAUSE", MainWindowViewModel.WorkNumder.ToString());
                                 client.SendAsync("SC821" + SYSKEY + SYSDAT);
-                            }
+                            }//暂停
                             else if (dat_821.GetValue("INSTRUCTION").ToString() == "CONTINUE")
                             {
-
                                 MainWindowViewModel.errTabler.Clear();
-                                MainWindowViewModel.WORK_RUN = 2;//
+                                MainWindowViewModel.WORK_RUN = 2;//PAUSE
-                                                                 //       
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "CONTINUE", MainWindowViewModel.WorkNumder.ToString());
                                 client.SendAsync("SC821" + SYSKEY + SYSDAT);
                             }//运行
                             else if (dat_821.GetValue("INSTRUCTION").ToString() == "JUMP")
@@ -298,6 +332,11 @@ namespace DyeingComputer.UserClass
                                 MainWindowViewModel.STEP_START(dat_821.GetValue("Numder").ToString(), Convert.ToDouble(dat_821.GetValue("P1")),
                                     Convert.ToDouble(dat_821.GetValue("P2")), Convert.ToDouble(dat_821.GetValue("P3")),
                                     Convert.ToDouble(dat_821.GetValue("P4")), Convert.ToDouble(dat_821.GetValue("P5")));
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "JUMP", "STEP = " +
+                                    MainWindowViewModel.RUN_STEPID + ";"+dat_821.GetValue("Numder").ToString()+";P1="+ 
+                                    Convert.ToDouble(dat_821.GetValue("P1")) + ";P2=" + Convert.ToDouble(dat_821.GetValue("P2")) + ";P3=" + 
+                                    Convert.ToDouble(dat_821.GetValue("P3")) + ";P4=" + Convert.ToDouble(dat_821.GetValue("P4")) + ";P5=" + 
+                                    Convert.ToDouble(dat_821.GetValue("P5")));
                             }//跳步
                             else if (dat_821.GetValue("INSTRUCTION").ToString() == "INSERT")
                             {
@@ -368,7 +407,7 @@ namespace DyeingComputer.UserClass
                                     MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入                                                                                     
                                 }
                                 //SQLiteHelpers.Close();  //关闭连接
-
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "INSERT", drtt.ToJsonString());
                                 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString());
                                 MainWindowViewModel.TX++;
                             }//插入
@@ -426,7 +465,7 @@ namespace DyeingComputer.UserClass
 
                                     MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入   
                                 } //SQLiteHelpers.Close();  //关闭连接
-
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "EDIT", dr.ToJsonString());
                                 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString());
                                 MainWindowViewModel.TX++;
                             }//编辑
@@ -450,7 +489,7 @@ namespace DyeingComputer.UserClass
                                     MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入   
                                 }
                                 //SQLiteHelpers.Close();  //关闭连接          
-
+                                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "CentralControl", "DELETE","ID="+ dat_821.GetValue("ID").ToString());
                                 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString());
                                 MainWindowViewModel.TX++;
                             }//删除
@@ -464,6 +503,23 @@ namespace DyeingComputer.UserClass
                     }
                     else { client.SendAsync("SC999"); }
                 }//启停跳步指令                 
+                else if (SYSAPI == "SC822")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+                        try
+                        {
+                            DataTable Workorder = MainWindow.SQLiteHelpers.ExecuteDataSet(
+                                    "select * from Workorder where ReDye=0 AND State='101'AND StartTime >'"+
+                                    DateTime.Now.AddHours(-1).ToString("yyyy/MM/dd  HH:mm:ss") +"'", null).Tables[0];  //读取表写入缓存                                                                                                
+
+                            client.SendAsync("SC822" + "[" + MainWindowViewModel.S01 + "]" + Workorder.ToJsonString());
+                            APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
+                        }
+                        catch (Exception ex) { client.SendAsync("SC922" + "[" + MainWindowViewModel.S01 + "]" + ex); }
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//最近可用工艺
                 else if (SYSAPI == "SC827")
                 {
                     if (SYSKEY == MainWindowViewModel.SYSKEY)
@@ -843,7 +899,7 @@ namespace DyeingComputer.UserClass
             await service.SetupAsync(new TouchSocketConfig()//载入配置
                 .SetMaxBufferSize(1024 * 1024 * 100)
                 .SetMinBufferSize(1024 * 1024)
-                .SetListenIPHosts(new IPHost[] { new IPHost("tcp://127.0.0.1:7789"), new IPHost(7790) })//同时监听两个地址
+                .SetListenIPHosts(new IPHost[] { new IPHost(7789), new IPHost(7790) })//同时监听两个地址
                 .ConfigureContainer(a =>//容器的配置顺序应该在最前面
                 {
                 })

UserClass/SQLDATA.cs

@@ -17,33 +17,7 @@ namespace DyeingComputer.UserClass
        // private static SQLiteHelper SQLiteHelpers = null;  //定义数据库
        // private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
 
-        //WorkOrder表检查写入
+
-        public static bool WorkOrder(string WorkOrder, string ProgramName, string StartTime, string EndTime, string Time, string Remark,string lock_,string state,string ProgramID, string color,string dyelot)
-        {
-           // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-           // SQLiteHelpers.Open();  //打开数据库
-            object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = "+ WorkOrder,null);            
-            if (i!=null) 
-            {
-                //SQLiteHelpers.Close();
-                return false;
-            }
-            Dictionary<string, object> WorkOrder_new = new Dictionary<string, object>();//缓存函数
-            WorkOrder_new.Add("WorkOrder", WorkOrder);
-            WorkOrder_new.Add("ProgramName", ProgramName);
-            WorkOrder_new.Add("StartTime", StartTime);
-            WorkOrder_new.Add("EndTime", EndTime);
-            WorkOrder_new.Add("Time", Time);
-            WorkOrder_new.Add("Remark", Remark);
-            WorkOrder_new.Add("lock", Convert.ToInt16(lock_));
-            WorkOrder_new.Add("state", Convert.ToInt16(state));
-            WorkOrder_new.Add("ProgramID", ProgramID);
-            WorkOrder_new.Add("color", color);
-            WorkOrder_new.Add("Dyelot", dyelot);
-            MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);
-            //SQLiteHelpers.Close();            
-            return true;
-        }
 
         public static bool WorkOderStep(DataTable WorkOrderStep_) 
         {

View/WorkOrderView.xaml.cs

@@ -429,10 +429,6 @@ namespace DyeingComputer.View
                 for (int i = 0; i < a; i++)
                 {
                     DataRow dr = WorkorderSteps.Rows[i];//行转
-                    dr.BeginEdit(); //添加订单号
-                    dr["ProgramID"] = Process_id;
-                    dr["Program"] = MainWindowViewModel.ProgramName;
-                    dr.EndEdit();
 
                     MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dr));//行插入
                 }
@@ -485,17 +481,17 @@ namespace DyeingComputer.View
             TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
             for (int i = 0; i < dat.Rows.Count; i++)
             {
-                switch (dat.Rows[i][5].ToString())//步骤用时计算
+                switch (dat.Rows[i].Field<string>("StepID"))//步骤用时计算
                 {
                     case "001":
                         TT = MSTT;
-                        TC = (Double)dat.Rows[i][9];
+                        TC = dat.Rows[i].Field<double>("Parameter2");
                         if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制
-                        MSTT = (Double)dat.Rows[i][8];
+                        MSTT = dat.Rows[i].Field<double>("Parameter1");
                         TT = Math.Abs(MSTT - TT) / TC * 60;
                         TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][12]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "007":
@@ -507,15 +503,15 @@ namespace DyeingComputer.View
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "013":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][10] * (Double)dat.Rows[i][11]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3") * dat.Rows[i].Field<double>("Parameter4")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "015":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][10]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "017":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][10]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "020":
@@ -527,24 +523,24 @@ namespace DyeingComputer.View
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "031":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "065":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][10]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "091":
                         TT = MSTT;
-                        TC = (Double)dat.Rows[i][9];
+                        TC = (Double)dat.Rows[i][7];
                         if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制
-                        MSTT = (Double)dat.Rows[i][8];
+                        MSTT = (Double)dat.Rows[i][6];
                         TT = Math.Abs(MSTT - TT) / TC * 60;
                         TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "093":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     default:

ViewModel/MainWindowViewModel.cs

@@ -826,6 +826,10 @@ namespace DyeingComputer.ViewModel
             STEP_ID = ID;
             switch (ID)
             {
+                case "999":
+                    SETP_runtime = true;
+                    STEP_finish = false;
+                    break;
                 case "001":
                     STEP_P1 = Convert.ToDouble(P1);
                     STEP_P2 = Convert.ToDouble(P2);
@@ -1028,6 +1032,8 @@ namespace DyeingComputer.ViewModel
             dt_TP = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from RUN", null).Tables[0];
             //SQLiteHelpers.Close();//关闭数据库
             //启动副功能
+            if (STEP_ID != "999")
+            {
                 STEP_RUN_slave_stop();
                 DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
                 if (arrRows.First().Field<object>("StepID_S1") != null)
@@ -1057,6 +1063,7 @@ namespace DyeingComputer.ViewModel
                     STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"];
                     STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"];
                 }
+            }
             User_Button = true;
         }
 
@@ -1082,6 +1089,9 @@ namespace DyeingComputer.ViewModel
                 {
                     switch (STEP_ID)
                     {
+                        case "999":
+                            Status_Str = Resources.Await+"[Not End]";
+                            break;
                         case "001":
                             if (Selet_dtd("3011"))
                             {
@@ -1134,7 +1144,8 @@ namespace DyeingComputer.ViewModel
                                     }
                                     if ((TEMP_co - T) > 5)
                                     {
-                                        ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Heats + Resources.LnsufficientPower + "]", "201-1");//写入
+                                        ERRinf.ERRinf_w(errTabler, Resources.Heats + ":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) + "°C" +
+                                            "[" + Resources.Heats + Resources.LnsufficientPower + "]", "201-1");//写入
                                     }
                                     else
                                     {
@@ -1166,7 +1177,8 @@ namespace DyeingComputer.ViewModel
                                     }
                                     if ((T - TEMP_co) > 5)
                                     {
-                                        ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Cooling + Resources.LnsufficientPower + "]", "201-2");//写入
+                                        ERRinf.ERRinf_w(errTabler, Resources.Cooling + ":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) + "°C" +
+                                            "[" + Resources.Cooling + Resources.LnsufficientPower + "]", "201-2");//写入
                                     }
                                     else
                                     {
@@ -2395,7 +2407,7 @@ namespace DyeingComputer.ViewModel
                             break;
                     }
 
-                    STEP_RUN_slave();//子功能
+                    if(STEP_ID!="999") STEP_RUN_slave();//子功能
                 }
                 else
                 {
@@ -2405,6 +2417,8 @@ namespace DyeingComputer.ViewModel
                         STEP_finish = false;
                         UserCall_OK = false;
                         RUN_STEPID = dt_TP.Select("RUN ='1'").First().Field<int>("Step") +1;
+                        try
+                        {
                             DataRow[] arrRows = dt_TP.Select("STEP ='" + RUN_STEPID + "'");
                             string T_ID = arrRows[0]["StepID"].ToString();
                             double T_P1 = Convert.ToDouble(arrRows[0]["Parameter1"].ToString());
@@ -2413,35 +2427,13 @@ namespace DyeingComputer.ViewModel
                             double T_P4 = Convert.ToDouble(arrRows[0]["Parameter4"].ToString());
                             double T_P5 = Convert.ToDouble(arrRows[0]["Parameter5"].ToString());
                             STEP_START(T_ID, T_P1, T_P2, T_P3, T_P4, T_P5);
-                 /*       if (arrRows.First().Field<object>("StepID_S1") != null)
-                        {
-                            STEP_IDp1 = (string)arrRows[0]["StepID_S1"];
-                            STEP_P1p1 = (double)arrRows[0]["Parameter1_S1"];
-                            STEP_P2p1 = (double)arrRows[0]["Parameter2_S1"];
-                            STEP_P3p1 = (double)arrRows[0]["Parameter3_S1"];
-                            STEP_P4p1 = (double)arrRows[0]["Parameter4_S1"];
-                            STEP_P5p1 = (double)arrRows[0]["Parameter5_S1"];
-                        }
-                        if (arrRows.First().Field<object>("StepID_S") != null)
-                        {
-                            STEP_IDp2 = (string)arrRows[0]["StepID_S2"];
-                            STEP_P1p2 = (double)arrRows[0]["Parameter1_S2"];
-                            STEP_P2p2 = (double)arrRows[0]["Parameter2_S2"];
-                            STEP_P3p2 = (double)arrRows[0]["Parameter3_S2"];
-                            STEP_P4p2 = (double)arrRows[0]["Parameter4_S2"];
-                            STEP_P5p2 = (double)arrRows[0]["Parameter5_S2"];
-                        }
-                        if (arrRows[0]["StepID_S2"] != null)
-                        {
-                            STEP_IDp3 = (string)arrRows[0]["StepID_S3"];
-                            STEP_P1p3 = (double)arrRows[0]["Parameter1_S3"];
-                            STEP_P2p3 = (double)arrRows[0]["Parameter2_S3"];
-                            STEP_P3p3 = (double)arrRows[0]["Parameter3_S3"];
-                            STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"];
-                            STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"];
-                        }*/
                             APILog.LOGlog(WorkNumder.ToString(), "Process", "Next", "STEP = " + RUN_STEPID + ";StepID=" +
                                 T_ID + ";P1=" + T_P1 + ";P2=" + T_P2 + ";P3=" + T_P3 + ";P4=" + T_P4 + ";P5=" + T_P5);
+                        }
+                        catch (Exception)
+                        {
+                            STEP_START("999", 0, 0, 0, 0, 0);
+                        }
                         if (ViewID == 1) { sys_workSTEPID = RUN_STEPID; } else { sys_workSTEPID = -1; }
                     }
                     if (errTabler.Rows.Count == 0)

app.manifest

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
+            元素。
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
+       
+       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>