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

MainWindow.xaml

@@ -97,8 +97,10 @@
         <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print" IsTabStop="False"/>
         <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False"/>
         <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False"/>
+        <Grid Height="250" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
 
 
-
+        </Grid>
+        
     </Grid>
 </Window>

Windows/APP_set.xaml

@@ -9,8 +9,11 @@
     <Grid>
         <CheckBox x:Name="Login_LINK" Height="19" Margin="15,15,605,0" VerticalAlignment="Top" Content="登录页面显示连接状态" IsTabStop="False" Checked="Login_LINK_Checked" Unchecked="Login_LINK_Checked"/>
         <CheckBox x:Name="Login_PRINT" Height="19" Margin="15,35,605,0" VerticalAlignment="Top" Content="确认立即打印料单" IsTabStop="False" Checked="Login_PRINT_Checked" Unchecked="Login_PRINT_Checked"/>
+        <CheckBox x:Name="Login_anew" Height="19" Margin="15,55,605,0" VerticalAlignment="Top" Content="单号相同时重染号修改" IsTabStop="False" Checked="Login_anew_Checked" Unchecked="Login_anew_Checked"/>
+
+
         <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"/>
-
+      
     </Grid>
 </Window>

Windows/APP_set.xaml.cs

@@ -33,10 +33,12 @@ namespace formula_manage.Windows
             Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
             Configini.IniWritevalue("SOFTWARE_SET", " L3",Prepose.Text);
+            Configini.IniWritevalue("SOFTWARE_SET", " L4", Loginanew.ToString());
         }
 
         bool Loginlink;
         bool Loginprint;
+        bool Loginanew;
         private void Window_SET(object sender, RoutedEventArgs e)
         {
 
@@ -45,6 +47,7 @@ namespace formula_manage.Windows
             Login_LINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
             Login_PRINT.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
             Prepose.Text = Configini.IniReadvalue("SOFTWARE_SET", "L3");  //自定义料单前缀
+            Login_anew.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //是否立即打印料单
 
         }
         private void Login_LINK_Checked(object sender, RoutedEventArgs e)
@@ -56,5 +59,10 @@ namespace formula_manage.Windows
         {
             Loginprint = Login_PRINT.IsChecked.GetValueOrDefault();    //是否立即打印料单
         }
+
+        private void Login_anew_Checked(object sender, RoutedEventArgs e)
+        {
+            Loginanew = Login_anew.IsChecked.GetValueOrDefault();    //是否
+        }
     }
 }