diff --git a/MainWindow.xaml b/MainWindow.xaml
index c2502ec..74984e2 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -53,26 +53,37 @@
-
+
+
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -80,25 +91,25 @@
Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" IsTabStop="False" Click="Button_StepUp" Focusable ="False"/>
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -182,13 +193,13 @@
-
+
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0aca606..8ecd433 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -79,28 +79,30 @@ namespace formula_manage
CountDown();//执行循环方法
- DataTable dataTable = new DataTable();
- dataTable.Columns.Add("ID", typeof(int));
- dataTable.Columns.Add("PRODUCT_CODE", typeof(string));
- dataTable.Columns.Add("CONC", typeof(string));
- dataTable.Columns.Add("SHIFT", typeof(string));
- dataTable.Columns.Add("PRODUCT_NAME", typeof(string));
- dataTable.Columns.Add("TARGET_WT", typeof(float));
- dataTable.Columns.Add("UNIT", typeof(string));
- dataTable.Columns.Add("REMARK", typeof(string));
-
- DataRow row = dataTable.NewRow(); //ID列
+ DataTable RRODUCTdataTable = new DataTable();
+ RRODUCTdataTable.Columns.Add("ID", typeof(int));
+ RRODUCTdataTable.Columns.Add("STEP", typeof(string));
+ RRODUCTdataTable.Columns.Add("PRODUCT_CODE", typeof(string));
+ RRODUCTdataTable.Columns.Add("CONC", typeof(string));
+ RRODUCTdataTable.Columns.Add("SHIFT", typeof(string));
+ RRODUCTdataTable.Columns.Add("PRODUCT_NAME", typeof(string));
+ RRODUCTdataTable.Columns.Add("TARGET_WT", typeof(float));
+ RRODUCTdataTable.Columns.Add("UNIT", typeof(string));
+ RRODUCTdataTable.Columns.Add("REMARK", typeof(string));
+
+ DataRow row = RRODUCTdataTable.NewRow(); //ID列
row["ID"] = ID_N;
- dataTable.Rows.Add(row);
-
+ row["STEP"] = Procedures_P.Text;
+ RRODUCTdataTable.Rows.Add(row);
for (ID_N = 2; ID_N <= 64; ID_N++)
{
- row = dataTable.NewRow();
+ row = RRODUCTdataTable.NewRow();
row["ID"] = ID_N;
- dataTable.Rows.Add(row);
+ row["STEP"] = Procedures_P.Text;
+ RRODUCTdataTable.Rows.Add(row);
}
// DetailedGrid.DataContext = dataTable;
- Grid_RRODUCT.ItemsSource = dataTable.DefaultView;
+ Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
}
@@ -121,8 +123,8 @@ namespace formula_manage
Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
}
- string Stuff_sql = "SELECT ProductCode ,ProductName ,ProductType ,Concentration FROM [Dispensing].[dbo].[PRODUCT]";//查询STUFF语句
- string MAC_sql = "SELECT Name ,MacGroup ,Capacity ,Volume ,Industry ,Categories ,Note FROM [Dispensing].[dbo].[MACHINE]";
+ string Stuff_sql = "SELECT ProductCode ,ProductName ,ProductType ,Concentration FROM [Dispensing].[dbo].[PRODUCT] order by ProductCode asc";//查询STUFF语句
+ string MAC_sql = "SELECT Name ,MacGroup ,Capacity ,Volume ,Industry ,Categories ,Note FROM [Dispensing].[dbo].[MACHINE] order by Name asc";//查询machine语句
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try
@@ -237,6 +239,7 @@ namespace formula_manage
{
USERTIME.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
+
public void CountDown()
{
//设置定时器
@@ -256,12 +259,13 @@ namespace formula_manage
string Prepose; //料单前置
string PreposeT; //料单时间
+ string PreposeS; //料单序列格式
+ int PreposeSl;
bool Loginprint;
bool Loginanew;
private void Window_MIN(object sender, RoutedEventArgs e)
{
-
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Loginprint = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2")); //是否立即打印料单
Loginanew = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3")); //是否立即打印料单
@@ -269,12 +273,25 @@ namespace formula_manage
Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1"); //自定义料单前缀
PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2"); //自定义料单时间
+ PreposeS = Configini.IniReadvalue("SOFTWARE_SET", "T3"); //自定义料单格式
+
+ Number_Event();
+ //Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT); //生成料单号
+ }
- Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT); //生成料单号
+ private void Number_Event() //生成料单号事件
+ {
+ int preposeL = PreposeS.Length;
+
+ PreposeSl = PreposeSl + 1;
+ string str = String.Format("{0:D"+ preposeL + "}", PreposeSl);
+
+ Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT) + str; //生成料单号
}
private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
{
+
//Regex re = new Regex("[^0-9.-]+");
Regex re = new Regex(@"^[0-9]+(.[0-9]{1,3})?$");// 非零的正整数
e.Handled = !re.IsMatch(e.Text);
@@ -391,14 +408,21 @@ namespace formula_manage
}
- private void save(object sender, RoutedEventArgs e)
+ private void save(object sender, RoutedEventArgs e) //保存按钮
{
+ if (int.Parse(Procedures_N.Text) > int.Parse(Procedures_P.Text))
+ {
+ MessageBoxResult result = System.Windows.MessageBox.Show("当前步骤与总步骤设定不符是否继续", "注意", MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
+ if (result == MessageBoxResult.OK) { } else return;
+ }
+ Procedures_N.Text = "1";
+ Procedures_P.Text = "1";
}
- private void Button_NewOrder(object sender, RoutedEventArgs e)
+ private void Button_NewOrder(object sender, RoutedEventArgs e) //新料单按钮
{
- Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT);
+ Number_Event();
}