Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -234,6 +234,7 @@ namespace formula_manage
         string Prepose;  //料单前置
         string PreposeT;  //料单时间
         string PreposeS;  //料单序列格式
+        string PreposeGKG;  //料单单位
         int PreposeSl;
         string str_Prepose;
         bool Loginprint;
@@ -245,6 +246,7 @@ namespace formula_manage
             Loginprint = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
             Loginanew = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3"));  //是否立即打印料单
             Machine.IsEditable = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
+            PreposeGKG = Configini.IniReadvalue("SOFTWARE_SET", "L5");//计算单位
 
             Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间