diff --git a/View/QueryView.xaml b/View/QueryView.xaml
index dbb77ad..29e7d5d 100644
--- a/View/QueryView.xaml
+++ b/View/QueryView.xaml
@@ -58,7 +58,7 @@
         <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
         </Border>
         <Grid Grid.Row="1">
-            <DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick"  ItemsSource="{Binding Dyelots}" SelectionMode="Single" 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="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" CanUserSortColumns="False" CanUserResizeColumns="False" CanUserReorderColumns="False">
+            <DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick"  ItemsSource="{Binding Dyelots}" SelectionMode="Single" 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="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" CanUserReorderColumns="False">
                 <DataGrid.RowStyle>
                     <Style TargetType="{x:Type DataGridRow}">
                         <Style.Triggers>
@@ -91,7 +91,7 @@
                     <DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0" MinWidth="0" CanUserReorder="False"/>
                 </DataGrid.Columns>
             </DataGrid>
-            <DataGrid x:Name="DataGridDyelotsBulkedRecipe"  ItemsSource="{Binding DyelotsBulkedRecipe}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False">
+            <DataGrid x:Name="DataGridDyelotsBulkedRecipe"  ItemsSource="{Binding DyelotsBulkedRecipe}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" CanUserReorderColumns="False">
                 <DataGrid.RowStyle >
                     <Style TargetType="{x:Type DataGridRow}">
                         <Style.Triggers>
diff --git a/View/QueryView.xaml.cs b/View/QueryView.xaml.cs
index 46969e3..e14b29a 100644
--- a/View/QueryView.xaml.cs
+++ b/View/QueryView.xaml.cs
@@ -70,19 +70,22 @@ namespace Audit.View
         private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件
         {
             int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量
-            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，单号
-            string DataGridReDye_value = (DataGridDyelots.Columns[1].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，重染
-            string DataGridMachine_value = (DataGridDyelots.Columns[2].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，机台
-            string DataGridCreationTime_value = (DataGridDyelots.Columns[3].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，开单时间
-            Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取工单单元格字符串填入工单输入框
-            Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取重染单元格字符串填入重染框
-            Dyelots_Machine.Text = DataGridMachine_value.ToString();//获取机台单元格字符串填入机台输入框
-            Dyelots_CreationTime.Text = DataGridCreationTime_value.ToString();//获取开单时间单元格字符串填入开单时间框
-            if (string.IsNullOrWhiteSpace(DataGridDyelots_value)) //工单为空进入下一步判断
-            {  } 
-            else 
+            if (rownum != -1)
             {
-                
+                string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，单号
+                string DataGridReDye_value = (DataGridDyelots.Columns[1].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，重染
+                string DataGridMachine_value = (DataGridDyelots.Columns[2].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，机台
+                string DataGridCreationTime_value = (DataGridDyelots.Columns[3].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，开单时间
+                Dyelots_Dyelot.Text = DataGridDyelots_value.ToString();//获取工单单元格字符串填入工单输入框
+                Dyelots_ReDye.Text = DataGridReDye_value.ToString(); //获取重染单元格字符串填入重染框
+                Dyelots_Machine.Text = DataGridMachine_value.ToString();//获取机台单元格字符串填入机台输入框
+                Dyelots_CreationTime.Text = DataGridCreationTime_value.ToString();//获取开单时间单元格字符串填入开单时间框
+                if (string.IsNullOrWhiteSpace(DataGridDyelots_value)) //工单为空进入下一步判断
+                { }
+                else
+                {
+
+                }
             }
         }
 
diff --git a/View/StuffView.xaml b/View/StuffView.xaml
index 8b69cfa..e164aa1 100644
--- a/View/StuffView.xaml
+++ b/View/StuffView.xaml
@@ -64,7 +64,7 @@
         </Border>
         <Grid Grid.Row="0"/>
         <Grid Grid.Row="1">
-            <DataGrid x:Name="DataGridStuff"  MouseDoubleClick="DataGridStuff_MouseDoubleClick"  ItemsSource="{Binding Product}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" Grid.ColumnSpan="2" CanUserSortColumns="False" CanUserResizeColumns="False" CanUserReorderColumns="False">
+            <DataGrid x:Name="DataGridStuff"  MouseDoubleClick="DataGridStuff_MouseDoubleClick"  ItemsSource="{Binding Product}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" d:ItemsSource="{d:SampleData ItemCount=200}" 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">
                 <DataGrid.RowStyle >
                     <Style TargetType="{x:Type DataGridRow}">
                         <Style.Triggers>
@@ -93,12 +93,12 @@
                     </Style>
                 </DataGrid.CellStyle>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="原料代码" Width="130" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="300" MinWidth="200" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="供应商" Width="150" FontSize="15" Binding="{Binding ProductUnit}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="原料类型" Width="80" FontSize="15" MaxWidth="200" MinWidth="70" CanUserReorder="False">
+                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" MaxWidth="50" MinWidth="20" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料代码" Width="130" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="130" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="200" MinWidth="200" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="100" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="供应商" Width="150" FontSize="15" Binding="{Binding ProductUnit}" MaxWidth="150" MinWidth="150" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="原料类型" Width="80" FontSize="15" MaxWidth="80" MinWidth="70" CanUserReorder="False">
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="{x:Type TextBlock}">
                                 <Setter Property="Text" Value="{Binding Path=ProductType,Converter={StaticResource ProductTypeSQLConvert}}"/>
@@ -130,7 +130,7 @@
                 <ComboBoxItem Content="粉体助剂"></ComboBoxItem>
             </ComboBox>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
-            <TextBox x:Name="stuff_Color" MouseDoubleClick="Stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" MaxLines="1" IsReadOnly="True"/>
+            <TextBox x:Name="stuff_Color" MouseDoubleClick="Stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" MaxLines="1" IsReadOnly="True" Cursor="Arrow"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20"/>
             <TextBox x:Name="stuff_ProductUnit" HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/>
diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs
index 6bccbdf..a1c99ca 100644
--- a/View/StuffView.xaml.cs
+++ b/View/StuffView.xaml.cs
@@ -43,34 +43,37 @@ namespace Audit.View
         private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             int rownum = DataGridStuff.SelectedIndex;//获取鼠标选中行并定义变量
-            string DataGridStuff_ProductCode = (DataGridStuff.Columns[1].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，原料代码
-            string DataGridStuff_ProductName = (DataGridStuff.Columns[2].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，原料名称
-            string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，价格
-            string DataGridStuff_ProductUnit = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，供应商           
-            string DataGridStuff_ProductType = (DataGridStuff.Columns[5].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第4列选中行单元格，类型
-            //string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum])as TextBlock).Text;//定位第5列选中行单元格，色彩
-            string DataGridStuff_Concentration = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第6列选中行单元格，浓度
-            string DataGridStuff_GRAVITY = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第7列选中行单元格，比重
-            //stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位第5列选中行单元格，色彩，背景色传递至色彩框背景色
-            stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码
-            stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
-            stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
-            stuff_ProductType.Text = DataGridStuff_ProductType.ToString();//填入类型 
-            stuff_ProductUnit.Text = DataGridStuff_ProductUnit.ToString();//填入供应商           
-            //stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩数据
-            stuff_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
-            stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
-            //if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。填入
-            //if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
-            //if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
-            if ((DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background != null) //定位第5列选中行单元格，色彩，判断参数是否有效
+            if (rownum != -1)
             {
-                stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background; //定位第5列选中行单元格，色彩，有效背景色传递至色彩框背景色
-            }
-            else
-            {
-                stuff_Color.Background = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));//有效背景色传递至色彩框背景色
-            }            
+                string DataGridStuff_ProductCode = (DataGridStuff.Columns[1].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，原料代码
+                string DataGridStuff_ProductName = (DataGridStuff.Columns[2].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，原料名称
+                string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，价格
+                string DataGridStuff_ProductUnit = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，供应商           
+                string DataGridStuff_ProductType = (DataGridStuff.Columns[5].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第4列选中行单元格，类型
+                                                                                                                                            //string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum])as TextBlock).Text;//定位第5列选中行单元格，色彩
+                string DataGridStuff_Concentration = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第6列选中行单元格，浓度
+                string DataGridStuff_GRAVITY = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第7列选中行单元格，比重
+                                                                                                                                        //stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位第5列选中行单元格，色彩，背景色传递至色彩框背景色
+                stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码
+                stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
+                stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
+                stuff_ProductType.Text = DataGridStuff_ProductType.ToString();//填入类型 
+                stuff_ProductUnit.Text = DataGridStuff_ProductUnit.ToString();//填入供应商           
+                                                                              //stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩数据
+                stuff_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
+                stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
+                                                                      //if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。填入
+                                                                      //if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
+                                                                      //if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
+                if ((DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background != null) //定位第5列选中行单元格，色彩，判断参数是否有效
+                {
+                    stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background; //定位第5列选中行单元格，色彩，有效背景色传递至色彩框背景色
+                }
+                else
+                {
+                    stuff_Color.Background = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));//有效背景色传递至色彩框背景色
+                }
+            }       
 
         }