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

MainWindow.xaml

@@ -209,7 +209,7 @@
         <Button x:Name="Save" Content="保存" IsEnabled="False" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
         <Button x:Name="Delete" Content="删除" IsEnabled="False" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
 
-        <Grid Grid.Column="1" Height="325" Margin="415,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
+        <Grid Grid.Column="1" Height="325" Margin="415,35,5,0" VerticalAlignment="Top" Background="White">
             <ContentControl x:Name="Deputy"/>
         </Grid>
 

View/ViewOrder.xaml

@@ -5,10 +5,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:formula_manage.View"
              mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="405">
+             d:DesignHeight="150" d:DesignWidth="405" Background="#FFE0E0E0">
     <Grid>
         <DataGrid x:Name="Order" AlternationCount="2" IsReadOnly="True"
-                   HeadersVisibility ="Column" Margin="0,0,0,0"  AutoGenerateColumns="False" MinColumnWidth="30"
+                   HeadersVisibility ="Column" Margin="0,0,0,40"  AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
                   BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"  
                   CanUserSortColumns="False" Background="White" SelectionMode="Single">
@@ -46,9 +46,17 @@
                 <DataGridTextColumn Header="工艺代码" Binding="{Binding ProcessCODE}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Visibility="Collapsed" IsReadOnly="True"/>
                 <DataGridTextColumn Header="品名" Binding="{Binding colour}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="客户" Binding="{Binding customer}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
-                <DataGridTextColumn Header="下单时间" Binding="{Binding OrdeTime}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" Visibility="Collapsed" IsReadOnly="True"/>
+                <DataGridTextColumn Header="下单时间" Binding="{Binding OrdeTime}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="备注" Binding="{Binding REMARK}" Width="800" FontSize="15" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
+        <ComboBox x:Name="condition" HorizontalAlignment="Left" Height="30" Width="100" VerticalAlignment="Bottom" FontSize="20" Margin="5,0,0,5">
+            <ComboBoxItem Content="工艺"></ComboBoxItem>
+            <ComboBoxItem Content="客户"></ComboBoxItem>
+            <ComboBoxItem Content="品名"></ComboBoxItem>
+        </ComboBox>
+        <TextBox x:Name="search" HorizontalAlignment="Left" Height="30" Margin="110,0,0,5" TextWrapping="Wrap" VerticalAlignment="Bottom" Width="200" FontSize="20"/>
+        <Button Content="搜索" Height="30" Margin="315,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="50" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" />
+
     </Grid>
 </UserControl>

View/ViewOrder.xaml.cs

@@ -53,7 +53,7 @@ namespace formula_manage.View
             {
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
             }
-            string MAC_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER]";//查询语句
+            string MAC_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
 
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
             try