diff --git a/MainWindow.xaml b/MainWindow.xaml
index bcfddc9..478dd48 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -42,20 +42,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -77,7 +80,7 @@
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 9fe49e8..b8b704c 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -31,13 +31,15 @@ namespace formula_manage
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
string Prepose; //料单前置
+ string PreposeT; //料单时间
private void Window_MIN(object sender, RoutedEventArgs e)
{
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
- Prepose = Configini.IniReadvalue("SOFTWARE_SET", "L3"); //自定义料单前缀
- Number.Text = Prepose + System.DateTime.Now.ToString("yyyyMMddHHmmss"); //生成料单号
+ Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1"); //自定义料单前缀
+ PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2"); //自定义料单时间
+ Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT); //生成料单号
}
@@ -113,7 +115,7 @@ namespace formula_manage
private void Button_NewOrder(object sender, RoutedEventArgs e)
{
- Number.Text = Prepose + System.DateTime.Now.ToString("yyyyMMddHHmmss"); ;
+ Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT);
}