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

MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage"
-        mc:Ignorable="d"
+        mc:Ignorable="d" Loaded="Window_MIN" 
         Title="SUNLIGHT" Height="720" Width="1280" BorderBrush="White" Background="#FFE0E0E0">
     <Grid>
         <Menu IsTabStop="False">
@@ -37,10 +37,19 @@
                 <MenuItem Header="_历史查询" FontSize="16"/>
                 <MenuItem Header="_统计" FontSize="16"/>
             </MenuItem>
+
         </Menu>
 
-        <TextBox HorizontalAlignment="Left" Height="20" Margin="60,65,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="155"/>
+        <Button Content="新工单" HorizontalAlignment="Left" Margin="335,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_Click"/>
+        <Button Content="预设工艺" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Click="Button_Click1"/>
 
+        <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,35,0,0" TextWrapping="Wrap" Text="物料单号:" VerticalAlignment="Top" Width="90" FontSize="20" Background="WhiteSmoke"/>
+        <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,70,0,0" TextWrapping="Wrap" Text="执行工艺:" VerticalAlignment="Top" Width="90" FontSize="20"/>
+        <TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
+        <TextBox HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" MaxLines="1" MaxLength="2"/>
+        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
+        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
+        
         <DataGrid x:Name="Selectio" AlternationCount="2" IsReadOnly="False" 
                   Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
@@ -75,12 +84,12 @@
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="步序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" />
-                <DataGridTextColumn Header="原料" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="计算单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>
+                <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>
-                <DataGridTextColumn Header="实际重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
             </DataGrid.Columns>
         </DataGrid>
@@ -89,5 +98,7 @@
         <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>
 </Window>

MainWindow.xaml.cs

@@ -24,7 +24,19 @@ namespace formula_manage
         public MainWindow()
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
-            InitializeComponent();
+            InitializeComponent();            
+        }
+        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
+
+        string Prepose;  //料单前置
+
+        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");  //生成料单号
+
         }
         private void SQL(object sender, RoutedEventArgs e)
         {
@@ -74,5 +86,16 @@ namespace formula_manage
         {
 
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Number.Text = Prepose + System.DateTime.Now.ToString("yyyyMMddHHmmss"); ;
+        }
+
+        private void Button_Click1(object sender, RoutedEventArgs e)
+        {
+
+        }
+
     }
 }

Windows/APP_set.xaml

@@ -9,6 +9,8 @@
     <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"/>
+        <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

@@ -23,9 +23,18 @@ namespace formula_manage.Windows
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
+            this.Closing += Window_Closing;   //添加窗口关闭事件
         }
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
+        {
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
+            Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
+            Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
+            Configini.IniWritevalue("SOFTWARE_SET", " L3",Prepose.Text);
+        }
+
         bool Loginlink;
         bool Loginprint;
         private void Window_SET(object sender, RoutedEventArgs e)
@@ -35,20 +44,17 @@ 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");  //自定义料单前缀
 
         }
         private void Login_LINK_Checked(object sender, RoutedEventArgs e)
         {
             Loginlink = Login_LINK.IsChecked.GetValueOrDefault();    //显示是否生效
-            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
-            Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
         }
 
         private void Login_PRINT_Checked(object sender, RoutedEventArgs e)
         {
             Loginprint = Login_PRINT.IsChecked.GetValueOrDefault();    //是否立即打印料单
-            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
-            Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
         }
     }
 }