Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -254,10 +254,17 @@ namespace formula_manage
         {
             int preposeL = PreposeS.Length;
 
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+            string PreposeT4 = Configini.IniReadvalue("SOFTWARE_SET", "T6");  //
+            string time =  System.DateTime.Now.ToString(PreposeT);
+            if (PreposeT4 != time) PreposeSl = 0;
             PreposeSl = PreposeSl + 1;
             str_Prepose = String.Format("{0:D" + preposeL + "}", PreposeSl);
 
-            Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT) + str_Prepose;  //生成料单号
+            Number.Text = Prepose + time + str_Prepose;  //生成料单号
+
+            Configini.IniWritevalue("SOFTWARE_SET", " T6", time);
+
         }
         private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
         {
@@ -461,8 +468,11 @@ namespace formula_manage
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";
 
+
+            Number_Event();
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);  //记录当前单序号
             Configini.IniWritevalue("SOFTWARE_SET", " T3", str_Prepose);
+
         }
 
         private void Button_NewOrder(object sender, RoutedEventArgs e) //新料单按钮