Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/QueryView.xaml

@@ -15,7 +15,7 @@
         <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
         </Border>
         <Grid Grid.Row="1">
-            <DataGrid ItemsSource="{Binding Dyelots}" AlternationCount="2" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
+            <DataGrid ItemsSource="{Binding Dyelots}" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
                 <DataGrid.RowStyle>
                     <Style TargetType="{x:Type DataGridRow}">
                         <Setter Property="FontSize" Value="12"/>
@@ -33,13 +33,25 @@
                         </Style.Triggers>
                     </Style>
                 </DataGrid.RowStyle>
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="MinWidth" Value="85"/>
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="LightBlue"/>
+                                <Setter Property="Foreground" Value="White"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.CellStyle>
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}"/>
                     <DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}"/>
-                    <DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
+                    <DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding DispenseMachine}"/>
                 </DataGrid.Columns>
             </DataGrid>
-            <DataGrid ItemsSource="{Binding DyelotsBulkedRecipe}" AlternationCount="2" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
+            <DataGrid ItemsSource="{Binding DyelotsBulkedRecipe}" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
                 <DataGrid.RowStyle>
                     <Style TargetType="{x:Type DataGridRow}">
                         <Style.Triggers>
@@ -67,7 +79,7 @@
                 </DataGrid.Columns>
             </DataGrid>
             <TextBox x:Name="Dyelots_Dyelot" HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1"/>
-            <TextBox x:Name="Dyelots_Machine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1"/>
+            <TextBox x:Name="Dyelots_DispenseMachine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1"/>
             <DatePicker HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
             <DatePicker HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>

Windows/Set_up_Sql.xaml

@@ -7,8 +7,8 @@
         mc:Ignorable="d"
          Title="设置" Height="600" Width="800" WindowStartupLocation="CenterScreen"  ResizeMode="NoResize">
     <Grid>
-        <Button Content="BD连接测试" HorizontalAlignment="Left" Height="35" Margin="135,245,0,0" VerticalAlignment="Top" Width="105" x:Name="BDtset" FontSize="15"/>
+        <Button Content="BD连接测试" HorizontalAlignment="Left" Height="35" Margin="135,285,0,0" VerticalAlignment="Top" Width="105" x:Name="BDtset" FontSize="15"/>
-        <Button Content="TI连接测试" HorizontalAlignment="Left" Height="35" Margin="350,245,0,0" VerticalAlignment="Top" Width="105" x:Name="TItset" FontSize="15"/>
+        <Button Content="TI连接测试" HorizontalAlignment="Left" Height="35" Margin="350,285,0,0" VerticalAlignment="Top" Width="105" x:Name="TItset" FontSize="15"/>
         <Button Content="退出" HorizontalAlignment="Left" Height="40" Margin="625,505,0,0" VerticalAlignment="Top" Width="120" x:Name="SetExit" FontSize="20" Click="SetExit_Click"/>
         <Button Content="保存" HorizontalAlignment="Left" Height="40" Margin="455,505,0,0" VerticalAlignment="Top" Width="120" x:Name="Save" FontSize="20"/>
         <TextBox HorizontalAlignment="Left" Height="40" Margin="135,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
@@ -17,10 +17,13 @@
         <TextBox HorizontalAlignment="Left" Height="40" Margin="350,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
         <TextBox HorizontalAlignment="Left" Height="40" Margin="350,120,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
         <TextBox HorizontalAlignment="Left" Height="40" Margin="350,170,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="135,220,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="350,220,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="205"/>
         <Label Content="BatchDyeingCentral" HorizontalAlignment="Left" Height="40" Margin="135,25,0,0" VerticalAlignment="Top" Width="215" FontSize="20"/>
         <Label Content="Ticket" HorizontalAlignment="Left" Height="40" Margin="350,25,0,0" VerticalAlignment="Top" Width="130" FontSize="20"/>
         <Label Content="SQL路径：" HorizontalAlignment="Left" Height="40" Margin="10,70,0,0" VerticalAlignment="Top" Width="120" FontSize="20"/>
         <Label Content="SQL账号：" HorizontalAlignment="Left" Height="40" Margin="10,120,0,0" VerticalAlignment="Top" Width="120" FontSize="20"/>
         <Label Content="SQL密码：" HorizontalAlignment="Left" Height="40" Margin="10,170,0,0" VerticalAlignment="Top" Width="120" FontSize="20"/>
+        <Label Content="更新时间：" HorizontalAlignment="Left" Height="40" Margin="10,220,0,0" VerticalAlignment="Top" Width="120" FontSize="20"/>
     </Grid>
 </mah:MetroWindow>