diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 762bf8b..e3096d9 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -580,12 +580,12 @@ 總量 - + 靜音 - + 加色 - + 副功能 \ No newline at end of file diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs index bc534aa..bb59820 100644 --- a/View/ProgramstepsView .xaml.cs +++ b/View/ProgramstepsView .xaml.cs @@ -157,11 +157,32 @@ namespace DyeingComputer.View dr["StepID"] = e.StepID; dr["StepName"] = e.StepNAME; dr["ParameterName"] = e.PNAME; - dr["Parameter1"] = e.P1; - dr["Parameter2"] = e.P2; - dr["Parameter3"] = e.P3; - dr["Parameter4"] = e.P4; - dr["Parameter5"] = e.P5; + dr["Parameter1"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter2"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter3"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter4"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter5"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter1_S1"] = e.Row_DAT.Field("Parameter1_S1"); + dr["Parameter2_S1"] = e.Row_DAT.Field("Parameter2_S1"); + dr["Parameter3_S1"] = e.Row_DAT.Field("Parameter3_S1"); + dr["Parameter4_S1"] = e.Row_DAT.Field("Parameter4_S1"); + dr["Parameter5_S1"] = e.Row_DAT.Field("Parameter5_S1"); + dr["Parameter1_S2"] = e.Row_DAT.Field("Parameter1_S2"); + dr["Parameter2_S2"] = e.Row_DAT.Field("Parameter2_S2"); + dr["Parameter3_S2"] = e.Row_DAT.Field("Parameter3_S2"); + dr["Parameter4_S2"] = e.Row_DAT.Field("Parameter4_S2"); + dr["Parameter5_S2"] = e.Row_DAT.Field("Parameter5_S2"); + dr["Parameter1_S3"] = e.Row_DAT.Field("Parameter1_S3"); + dr["Parameter2_S3"] = e.Row_DAT.Field("Parameter2_S3"); + dr["Parameter3_S3"] = e.Row_DAT.Field("Parameter3_S3"); + dr["Parameter4_S3"] = e.Row_DAT.Field("Parameter4_S3"); + dr["Parameter5_S3"] = e.Row_DAT.Field("Parameter5_S3"); + dr["StepName_S1"] = e.Row_DAT.Field("StepName_S1"); + dr["StepName_S2"] = e.Row_DAT.Field("StepName_S2"); + dr["StepName_S3"] = e.Row_DAT.Field("StepName_S3"); + dr["StepID_S1"] = e.Row_DAT.Field("StepID_S1"); + dr["StepID_S2"] = e.Row_DAT.Field("StepID_S2"); + dr["StepID_S3"] = e.Row_DAT.Field("StepID_S3"); dr.EndEdit(); Grid.ItemsSource = sql.Tables[0].DefaultView; diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index 0f8ce27..e4ca8de 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -347,11 +347,32 @@ namespace DyeingComputer.View dr["StepID"] = e.StepID; dr["StepName"] = e.StepNAME; dr["ParameterName"] = e.PNAME; - dr["Parameter1"] = e.P1; - dr["Parameter2"] = e.P2; - dr["Parameter3"] = e.P3; - dr["Parameter4"] = e.P4; - dr["Parameter5"] = e.P5; + dr["Parameter1"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter2"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter3"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter4"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter5"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter1_S1"] = e.Row_DAT.Field("Parameter1_S1"); + dr["Parameter2_S1"] = e.Row_DAT.Field("Parameter2_S1"); + dr["Parameter3_S1"] = e.Row_DAT.Field("Parameter3_S1"); + dr["Parameter4_S1"] = e.Row_DAT.Field("Parameter4_S1"); + dr["Parameter5_S1"] = e.Row_DAT.Field("Parameter5_S1"); + dr["Parameter1_S2"] = e.Row_DAT.Field("Parameter1_S2"); + dr["Parameter2_S2"] = e.Row_DAT.Field("Parameter2_S2"); + dr["Parameter3_S2"] = e.Row_DAT.Field("Parameter3_S2"); + dr["Parameter4_S2"] = e.Row_DAT.Field("Parameter4_S2"); + dr["Parameter5_S2"] = e.Row_DAT.Field("Parameter5_S2"); + dr["Parameter1_S3"] = e.Row_DAT.Field("Parameter1_S3"); + dr["Parameter2_S3"] = e.Row_DAT.Field("Parameter2_S3"); + dr["Parameter3_S3"] = e.Row_DAT.Field("Parameter3_S3"); + dr["Parameter4_S3"] = e.Row_DAT.Field("Parameter4_S3"); + dr["Parameter5_S3"] = e.Row_DAT.Field("Parameter5_S3"); + dr["StepName_S1"] = e.Row_DAT.Field("StepName_S1"); + dr["StepName_S2"] = e.Row_DAT.Field("StepName_S2"); + dr["StepName_S3"] = e.Row_DAT.Field("StepName_S3"); + dr["StepID_S1"] = e.Row_DAT.Field("StepID_S1"); + dr["StepID_S2"] = e.Row_DAT.Field("StepID_S2"); + dr["StepID_S3"] = e.Row_DAT.Field("StepID_S3"); dr.EndEdit(); // MainWindowViewModel.dt_TP = sql.Tables[0]; @@ -379,8 +400,7 @@ namespace DyeingComputer.View } SQLiteHelpers.Close(); //关闭连接 APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "STEP = " + n, - "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P1=" + e.P1 + - ";P2=" + e.P2 + ";P3=" + e.P3 + ";P4=" + e.P4 + ";P5=" + e.P5); + "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + e.Row_DAT); MainWindowViewModel.User_Button = true; } public static void Dat()//行号刷新 @@ -488,11 +508,32 @@ namespace DyeingComputer.View dr["StepID"] = e.StepID; dr["StepName"] = e.StepNAME; dr["ParameterName"] = e.PNAME; - dr["Parameter1"] = e.P1; - dr["Parameter2"] = e.P2; - dr["Parameter3"] = e.P3; - dr["Parameter4"] = e.P4; - dr["Parameter5"] = e.P5; + dr["Parameter1"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter2"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter3"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter4"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter5"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter1_S1"] = e.Row_DAT.Field("Parameter1_S1"); + dr["Parameter2_S1"] = e.Row_DAT.Field("Parameter2_S1"); + dr["Parameter3_S1"] = e.Row_DAT.Field("Parameter3_S1"); + dr["Parameter4_S1"] = e.Row_DAT.Field("Parameter4_S1"); + dr["Parameter5_S1"] = e.Row_DAT.Field("Parameter5_S1"); + dr["Parameter1_S2"] = e.Row_DAT.Field("Parameter1_S2"); + dr["Parameter2_S2"] = e.Row_DAT.Field("Parameter2_S2"); + dr["Parameter3_S2"] = e.Row_DAT.Field("Parameter3_S2"); + dr["Parameter4_S2"] = e.Row_DAT.Field("Parameter4_S2"); + dr["Parameter5_S2"] = e.Row_DAT.Field("Parameter5_S2"); + dr["Parameter1_S3"] = e.Row_DAT.Field("Parameter1_S3"); + dr["Parameter2_S3"] = e.Row_DAT.Field("Parameter2_S3"); + dr["Parameter3_S3"] = e.Row_DAT.Field("Parameter3_S3"); + dr["Parameter4_S3"] = e.Row_DAT.Field("Parameter4_S3"); + dr["Parameter5_S3"] = e.Row_DAT.Field("Parameter5_S3"); + dr["StepName_S1"] = e.Row_DAT.Field("StepName_S1"); + dr["StepName_S2"] = e.Row_DAT.Field("StepName_S2"); + dr["StepName_S3"] = e.Row_DAT.Field("StepName_S3"); + dr["StepID_S1"] = e.Row_DAT.Field("StepID_S1"); + dr["StepID_S2"] = e.Row_DAT.Field("StepID_S2"); + dr["StepID_S3"] = e.Row_DAT.Field("StepID_S3"); dr.EndEdit(); // MainWindowViewModel.dt_TP = sql.Tables[0]; @@ -522,8 +563,7 @@ namespace DyeingComputer.View } SQLiteHelpers.Close(); //关闭连接 APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "STEP = " + n, - "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P1=" + e.P1 + - ";P2=" + e.P2 + ";P3=" + e.P3 + ";P4=" + e.P4 + ";P5=" + e.P5); + "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + e.Row_DAT); MainWindowViewModel.User_Button = true; } private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e) diff --git a/Windows/ViewStep.xaml b/Windows/ViewStep.xaml index b296071..5802d15 100644 --- a/Windows/ViewStep.xaml +++ b/Windows/ViewStep.xaml @@ -11,9 +11,9 @@ Title="SUNLIGHT 800" Height="800" Width="600"> - + - + @@ -72,20 +72,20 @@ TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP5" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" /> - - + + + IsReadOnly="True" FontSize="20" HorizontalContentAlignment="Right" MaxLength="3"/> @@ -127,20 +126,20 @@ TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP4" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" /> - - + +