diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs
index e4ca8de..8080407 100644
--- a/View/TechnologicalProcessView.xaml.cs
+++ b/View/TechnologicalProcessView.xaml.cs
@@ -400,7 +400,7 @@ namespace DyeingComputer.View
}
SQLiteHelpers.Close(); //关闭连接
APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "STEP = " + n,
- "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + e.Row_DAT);
+ "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + string.Join(",", e.Row_DAT.ItemArray));
MainWindowViewModel.User_Button = true;
}
public static void Dat()//行号刷新
@@ -485,6 +485,12 @@ namespace DyeingComputer.View
dr["Parameter3_S3"] = 0;
dr["Parameter4_S3"] = 0;
dr["Parameter5_S3"] = 0;
+ dr["StepName_S1"] = " ";
+ dr["StepName_S2"] = " ";
+ dr["StepName_S3"] = " ";
+ dr["StepID_S1"] = "000";
+ dr["StepID_S2"] = "000";
+ dr["StepID_S3"] = "000";
MainWindowViewModel.dt_TP.Rows.InsertAt(dr, d - 1);
// ID = null;
Dat();
@@ -563,7 +569,7 @@ namespace DyeingComputer.View
}
SQLiteHelpers.Close(); //关闭连接
APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "STEP = " + n,
- "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + e.Row_DAT);
+ "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P=" + string.Join(",", e.Row_DAT.ItemArray));
MainWindowViewModel.User_Button = true;
}
private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e)
diff --git a/Windows/ViewStep.xaml b/Windows/ViewStep.xaml
index 5802d15..9251874 100644
--- a/Windows/ViewStep.xaml
+++ b/Windows/ViewStep.xaml
@@ -97,41 +97,44 @@
VerticalAlignment="Top" Width="230" FontSize="20" SelectionChanged="boxIDp_SelectionChanged"/>
+ IsReadOnly="True" FontSize="20" HorizontalContentAlignment="Right" MaxLength="3"
+ TextChanged="TextBoxp_TextChanged" />
diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs
index 261a0af..f83a695 100644
--- a/Windows/ViewStep.xaml.cs
+++ b/Windows/ViewStep.xaml.cs
@@ -109,10 +109,77 @@ namespace DyeingComputer.Windows
P5.SelectionStart, e.Text));
P5.Text = P5.Text.Trim();
}
+ private void Tb_KeyP1p(object sender, TextCompositionEventArgs e)//输入事件P1
+ {
+ Regex numbeRegex = new Regex("^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");
+ e.Handled =
+ !numbeRegex.IsMatch(
+ P1P.Text.Insert(
+ P1P.SelectionStart, e.Text));
+ P1P.Text = P1P.Text.Trim();
+ }
+ private void Tb_KeyP2p(object sender, TextCompositionEventArgs e)//输入事件P2
+ {
+ Regex numbeRegex = new Regex("^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");
+ e.Handled =
+ !numbeRegex.IsMatch(
+ P2P.Text.Insert(
+ P2P.SelectionStart, e.Text));
+ P2P.Text = P2P.Text.Trim();
+ }
+ private void Tb_KeyP3p(object sender, TextCompositionEventArgs e)//输入事件P3
+ {
+ Regex numbeRegex = new Regex("^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");
+ e.Handled =
+ !numbeRegex.IsMatch(
+ P3P.Text.Insert(
+ P3P.SelectionStart, e.Text));
+ P3P.Text = P3P.Text.Trim();
+ }
+ private void Tb_KeyP4p(object sender, TextCompositionEventArgs e)//输入事件P4
+ {
+ Regex numbeRegex = new Regex("^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");
+ e.Handled =
+ !numbeRegex.IsMatch(
+ P4P.Text.Insert(
+ P4P.SelectionStart, e.Text));
+ P4P.Text = P4P.Text.Trim();
+ }
+ private void Tb_KeyP5p(object sender, TextCompositionEventArgs e)//输入事件P5
+ {
+ Regex numbeRegex = new Regex("^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");
+ e.Handled =
+ !numbeRegex.IsMatch(
+ P5P.Text.Insert(
+ P5P.SelectionStart, e.Text));
+ P5P.Text = P5P.Text.Trim();
+ }
+ private void P1P_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ try
+ {
+ dat_D.BeginEdit();
+ if (dat_P == 1)
+ {
+ dat_D["Parameter1_S1"] = Convert.ToDouble(P1P.Text);
+ }
+ else if (dat_P == 2)
+ {
+ dat_D["Parameter1_S2"] = Convert.ToDouble(P1P.Text);
+ }
+ else if (dat_P == 3)
+ {
+ dat_D["Parameter1_S3"] = Convert.ToDouble(P1P.Text);
+ }
+ dat_D.EndEdit();
+ }
+ catch (Exception) { }
+ }
+
private readonly string[] id_dat = {"001","007","008","013","015" ,"017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
"051", "054", "055", "056","064","065","066","067","090","091","093","094" };
- private readonly string[] id_datp = {"","001","007","008","013","015" ,"017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
+ private readonly string[] id_datp = {" ","001","007","008","013","015" ,"017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
"051", "054", "055", "056","064","065","066","067","090","091","093","094" };
private void Form1_Load()
@@ -197,6 +264,30 @@ namespace DyeingComputer.Windows
}
}
}
+ private void TextBoxp_TextChanged(object sender, TextChangedEventArgs e)//输入事件
+ {
+ int l = boxNAMEp.Text.Length;
+ string text = boxNAMEp.Text.ToString();
+ if (l == 3)
+ {
+ int g = Array.IndexOf(id_datp, text);//数组索引
+ if (g != -1)
+ {
+ boxIDp.SelectedIndex = g;//有效索引传入
+ Setp(id_datp[g]);
+ }
+ else
+ {
+ boxIDp.SelectedIndex = -1;
+ Setp("-1");
+ }
+ }
+ else
+ {
+ boxIDp.SelectedIndex = 0;//空白
+ Setp(id_datp[0]);
+ }
+ }
private void BoxID_SelectionChanged(object sender, SelectionChangedEventArgs e)//下拉框选择事件
{
if (boxID.SelectedIndex !=-1)
@@ -213,6 +304,24 @@ namespace DyeingComputer.Windows
int i = boxIDp.SelectedIndex;
boxNAMEp.Text = id_datp.ElementAt(i);
Setp(id_datp[i]);
+
+ dat_D.BeginEdit();
+ if (dat_P == 1)
+ {
+ dat_D["StepID_S1"] = boxNAMEp.Text;
+ dat_D["StepName_S1"] = e.AddedItems[0];
+ }
+ else if (dat_P == 2)
+ {
+ dat_D["StepID_S2"] = boxNAMEp.Text;
+ dat_D["StepName_S2"] = e.AddedItems[0];
+ }
+ else if (dat_P == 3)
+ {
+ dat_D["StepID_S3"] = boxNAMEp.Text;
+ dat_D["StepName_S3"] = e.AddedItems[0];
+ }
+ dat_D.EndEdit();
}
}
private void YES_Click(object sender, RoutedEventArgs e)//确认
@@ -1425,49 +1534,44 @@ namespace DyeingComputer.Windows
{
((Image)sender).RenderTransform = new ScaleTransform(0.9, 0.9);
}
-
private void imageP2_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
((Image)sender).RenderTransform = new ScaleTransform(0.9, 0.9);
}
-
private void imageP3_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
((Image)sender).RenderTransform = new ScaleTransform(0.9, 0.9);
}
-
private void imageP1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
((Image)sender).RenderTransform = Transform.Identity;
dat_P = 1;
Sub.Text = Properties.Resources.Subroutine + ": "+dat_P.ToString();
- boxNAMEp.Text = dat_D.Field("StepName_S1");
+ boxNAMEp.Text = dat_D.Field("StepID_S1");
P1P.Text = dat_D.Field("Parameter1_S1").ToString();
P2P.Text = dat_D.Field("Parameter2_S1").ToString();
P3P.Text = dat_D.Field("Parameter3_S1").ToString();
P4P.Text = dat_D.Field("Parameter4_S1").ToString();
P5P.Text = dat_D.Field("Parameter5_S1").ToString();
}
-
private void imageP2_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
((Image)sender).RenderTransform = Transform.Identity;
dat_P = 2;
Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
- boxNAMEp.Text = dat_D.Field("StepName_S2");
+ boxNAMEp.Text = dat_D.Field("StepID_S2");
P1P.Text = dat_D.Field("Parameter1_S2").ToString();
P2P.Text = dat_D.Field("Parameter2_S2").ToString();
P3P.Text = dat_D.Field("Parameter3_S2").ToString();
P4P.Text = dat_D.Field("Parameter4_S2").ToString();
P5P.Text = dat_D.Field("Parameter5_S2").ToString();
}
-
private void imageP3_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
((Image)sender).RenderTransform = Transform.Identity;
dat_P = 3;
Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
- boxNAMEp.Text = dat_D.Field("StepName_S2");
+ boxNAMEp.Text = dat_D.Field("StepID_S3");
P1P.Text = dat_D.Field("Parameter1_S3").ToString();
P2P.Text = dat_D.Field("Parameter2_S3").ToString();
P3P.Text = dat_D.Field("Parameter3_S3").ToString();