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

Windows/APP_set.xaml

@@ -12,13 +12,14 @@
         <CheckBox x:Name="Login_PRINT" HorizontalAlignment="Left" Height="19" Margin="15,35,0,0" VerticalAlignment="Top" Width="150" Content="确认立即打印料单" IsTabStop="False" Checked="Login_PRINT_Checked" Unchecked="Login_PRINT_Checked"/>
         <CheckBox x:Name="Login_MACHINE" HorizontalAlignment="Left" Height="19" Margin="15,55,0,0" VerticalAlignment="Top" Width="150" Content="允许输入机台号" IsTabStop="False" Checked="Login_MAC_Checked" Unchecked="Login_MAC_Checked"/>
         <CheckBox x:Name="Login_anew" HorizontalAlignment="Left" Height="19" Margin="15,75,0,0" VerticalAlignment="Top" Width="150" Content="单号相同时重染号修改" IsTabStop="False" Checked="Login_anew_Checked" Unchecked="Login_anew_Checked"/>
-        <ComboBox x:Name="Login_Gkg" HorizontalAlignment="Left" Height="19" Margin="300,15,0,0" VerticalAlignment="Top" Width="150">
-            <ComboBoxItem Content="AUTO"></ComboBoxItem>
-            <ComboBoxItem Content="G"></ComboBoxItem>
-            <ComboBoxItem Content="Kg"></ComboBoxItem>
-        </ComboBox>
-
 
+        <TextBlock HorizontalAlignment="Left" Height="19" Margin="245,15,0,0" TextWrapping="Wrap" Text="显示单位" VerticalAlignment="Top" Width="55"/>
+        <ComboBox x:Name="Login_Gkg" HorizontalAlignment="Left" Height="19" Margin="300,15,0,0" VerticalAlignment="Top" Width="100">
+            <ComboBoxItem Content="AUTO" FontSize="10"></ComboBoxItem>
+            <ComboBoxItem Content="G" FontSize="10"></ComboBoxItem>
+            <ComboBoxItem Content="KG" FontSize="10"></ComboBoxItem>
+            <ComboBoxItem Content="KG/L" FontSize="10"></ComboBoxItem>
+        </ComboBox>
 
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="10,220,0,0" TextWrapping="Wrap" Text="前缀名称" VerticalAlignment="Top" Width="75" FontSize="14"/>
         <TextBox x:Name="Prepose" HorizontalAlignment="Left" Height="20" Margin="85,220,0,0" TextWrapping="Wrap" Text="D" VerticalAlignment="Top" Width="125"/>

Windows/APP_set.xaml.cs

@@ -40,6 +40,7 @@ namespace formula_manage.Windows
             Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L3", Loginanew.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L4", LoginMAC.ToString());
+            Configini.IniWritevalue("SOFTWARE_SET", " L5", Login_Gkg.Text);
 
 
             Configini.IniWritevalue("SOFTWARE_SET", " T1", Prepose.Text);
@@ -68,6 +69,7 @@ namespace formula_manage.Windows
             Login_PRINT.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
             Login_anew.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3"));  //是否立即打印料单
             Login_MACHINE.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
+            Login_Gkg.Text = Configini.IniReadvalue("SOFTWARE_SET", "L5"); //单位识别
 
             Prepose.Text = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             TimeFormat.Text = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间格式