diff --git a/ConvertMoels/StatenConvert.cs b/ConvertMoels/StatenConvert.cs index b0e26da..edf4430 100644 --- a/ConvertMoels/StatenConvert.cs +++ b/ConvertMoels/StatenConvert.cs @@ -28,7 +28,8 @@ namespace DyeingComputer.ConvertMoels else if (i == "203") Staten = Properties.Resources.Await; else if (i == "301") Staten = Properties.Resources.Finish; else if (i == "309") Staten = Properties.Resources.Abnormal; - else if (i == "800") Staten = Properties.Resources.NotxEcuted; + else if (i == "800") Staten = Properties.Resources.Notimplementation; + else if (i == "801") Staten = Properties.Resources.Implementation; else Staten = "null"; return Staten; diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 3ea6e42..66640e7 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -366,6 +366,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Implementation 的本地化字符串。 + /// + public static string Implementation { + get { + return ResourceManager.GetString("Implementation", resourceCulture); + } + } + /// /// 查找类似 I/O 的本地化字符串。 /// @@ -457,11 +466,11 @@ namespace DyeingComputer.Properties { } /// - /// 查找类似 NotExecuted 的本地化字符串。 + /// 查找类似 Notimplementation 的本地化字符串。 /// - public static string NotxEcuted { + public static string Notimplementation { get { - return ResourceManager.GetString("NotxEcuted", resourceCulture); + return ResourceManager.GetString("Notimplementation", resourceCulture); } } @@ -573,6 +582,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 The process does not exist 的本地化字符串。 + /// + public static string process_not { + get { + return ResourceManager.GetString("process_not", resourceCulture); + } + } + /// /// 查找类似 ProcessName 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 6b75575..62750ef 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -210,9 +210,6 @@ Line Up - - Not Executed - State @@ -396,4 +393,13 @@ Overflow + + The process does not exist + + + Implementation + + + Not Implementation + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 4af415f..1b0b0d9 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -210,8 +210,8 @@ LineUp - - NotExecuted + + Notimplementation Confirm @@ -396,4 +396,10 @@ Wiggle + + Implementation + + + The process does not exist + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 85aaed8..aaa968c 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -210,9 +210,6 @@ 准备 - - 未执行 - 状态 @@ -396,4 +393,13 @@ 溢流 + + 工艺不存在 + + + 未执行 + + + 执行 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index d5f0268..9074700 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -210,9 +210,6 @@ 計量 - - 未執行 - 狀態 @@ -396,4 +393,13 @@ 溢流 + + 流程不存在 + + + 未執行 + + + 執行 + \ No newline at end of file diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml index 3553f3d..312fdd6 100644 --- a/View/TechnologicalProcessView.xaml +++ b/View/TechnologicalProcessView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:DyeingComputer.View" xmlns:lang="clr-namespace:DyeingComputer.Properties" - mc:Ignorable="d" + mc:Ignorable="d" Loaded="UserControl_Loaded" d:DesignHeight="630" d:DesignWidth="1280"> diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index eb47dbf..b8c3594 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -26,8 +26,7 @@ namespace DyeingComputer.View { public TechnologicalProcessView() { - InitializeComponent(); - TechnologicalProcess_sql(); + InitializeComponent(); } public static object workName; @@ -50,5 +49,10 @@ namespace DyeingComputer.View SQLiteHelpers.Close(); //关闭连接 if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 } + + private void UserControl_Loaded(object sender, RoutedEventArgs e) + { + if(workName !=null) TechnologicalProcess_sql(); + } } } diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml index 3fa58e0..399320f 100644 --- a/View/WorkOrderView.xaml +++ b/View/WorkOrderView.xaml @@ -70,7 +70,7 @@ - +