diff --git a/MainWindow.xaml b/MainWindow.xaml
index d595d72..3c830a6 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -61,7 +61,7 @@
-
+
@@ -71,9 +71,14 @@
-
-
+
+
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0c34ba9..3fb8f8e 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -57,6 +57,7 @@ namespace formula_manage
string TEXT_SQLPASWOR;
string Connstr_SC;
int ID_N = 1;
+ string DYELOT_;
public MainWindow()
{
@@ -104,7 +105,6 @@ namespace formula_manage
row["ID"] = ID_N;
row["STEP"] = Procedures_P.Text;
row["UNIT"] = "g";
- //row["SHIFT"] = "g";
RRODUCTdataTable.Rows.Add(row);
Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
@@ -225,6 +225,29 @@ namespace formula_manage
}
}
+ private void Machine_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //机台回车跳转功能
+ {
+ if (e.Key == Key.Enter)
+ {
+ if (Machine.Text == "")
+ {
+ System.Windows.MessageBox.Show("请确认机台");
+ return;
+ }
+
+ DataRow[] m = MainWindowViewModel.MACHINEdatatemp.Select("Name ='" + Machine.Text + "'"); //查询判断原料代码是否有效
+ if (m.Any()) //检查原料信息
+ {
+ System.Windows.MessageBox.Show("机台不存在");
+ Machine.Text = "";
+ return;
+ }
+
+ UserClass.PressKey.PressKeys(Keys.Tab, false);
+ UserClass.PressKey.PressKeys(Keys.Tab, true);
+ }
+ }
+
string Prepose; //料单前置
string PreposeT; //料单时间
string PreposeS; //料单序列格式
@@ -613,9 +636,7 @@ namespace formula_manage
rowadd = RRODUCTdataTable.NewRow();
ID_N++;
rowadd["ID"] = ID_N;
- // row["STEP"] = "1";
rowadd["UNIT"] = "g";
- // row["STEP"] = Procedures_P.Text;
RRODUCTdataTable.Rows.Add(rowadd);
}
}
@@ -795,6 +816,9 @@ namespace formula_manage
}
}
-
+ private void Machine_DropDownClosed(object sender, EventArgs e)//选择机台事件
+ {
+ DYELOT_ = Number.Text;
+ }
}
}
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index cc38112..4593619 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -38,13 +38,14 @@ namespace formula_manage.ViewModel
///
public class MainWindowViewModel : ViewModelBase
{
- DataTable DissolvedataTable = new DataTable(); //建立Dissolve缓存
- DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存
- DataTable MACHINEdataTable = new DataTable(); //建立Machine缓存
- DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT缓存
- DataTable RecipedataTable = new DataTable(); //建立Recipe缓存
+ DataTable DissolvedataTable = new DataTable(); //建立Dissolve
+ DataTable STUFFdataTable = new DataTable(); //建立STUFF
+ DataTable MACHINEdataTable = new DataTable(); //建立Machine
+ DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT
+ DataTable RecipedataTable = new DataTable(); //建立Recipe
public static DataTable STUFFdatatemp = new DataTable(); //建立STUFF缓存
+ public static DataTable MACHINEdatatemp = new DataTable(); //建立Machine缓存
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
public string sys_Time; //显示系统时间
@@ -113,6 +114,7 @@ namespace formula_manage.ViewModel
flow_Workflow = ToObservableCollection(DissolvedataTable);
STUFFdatatemp = STUFFdataTable;
+ MACHINEdatatemp = MACHINEdataTable;
}