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

View/StuffView.xaml

@@ -25,7 +25,7 @@
         <Grid Grid.Row="0"/>
         <Grid Grid.Row="1">
             <!--原料表-->
-            <DataGrid x:Name="DataGridStuff"  MouseDoubleClick="DataGridStuff_MouseDoubleClick"  ItemsSource="{Binding Product, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 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 x:Name="DataGridStuff"  MouseDoubleClick="DataGridStuff_MouseDoubleClick" ItemsSource="{Binding Product, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 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>
@@ -55,7 +55,13 @@
                 </DataGrid.CellStyle>
                 <DataGrid.Columns>
                     <!--列信息绑定-->
-                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" MaxWidth="50" MinWidth="20" CanUserReorder="False"/>
+                    <DataGridTemplateColumn Header=" 序号" Width="50" MinWidth="10" IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock FontSize="15"  Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <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="价格(￥/kg)" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="100" MinWidth="100" CanUserReorder="False"/>

View/StuffView.xaml.cs

@@ -33,12 +33,23 @@ namespace Audit.View
         public StuffView()
         {
             InitializeComponent();
+            this.DataGridStuff.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号
         }
+        
+        /// <summary>
+        /// 生成序列号的方法
+        /// </summary>
+        private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = e.Row.GetIndex() + 1;
+        }
+
         /// <summary>
         /// 公共变量数组实体
         /// </summary>
         private Product product = new Product();//最终存入sql的实体
         private Product product_temp = new Product();//取出自sql的实体缓存
+        public static Boolean Button_sql = false;
 
         private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
         {
@@ -88,8 +99,8 @@ namespace Audit.View
                 product.ProductType = int_stuff_ProductType;//写入原料类型             
                 new ProductProvider().Delete(product_temp);//删除数据库原目标信息。
                 var count = new ProductProvider().Insert(product);//添加数据库信息。
-                if (count == 0) System.Windows.MessageBox.Show("ERR.C0110-1：添加失败","错误");//判断执行是否成功   
-
+                if (count == 0) System.Windows.MessageBox.Show("ERR.C0110-1：添加失败", "错误");//判断执行是否成功   
+                else Button_sql = true;
             }         
         }
 
@@ -102,6 +113,7 @@ namespace Audit.View
             {
                 var count = new ProductProvider().Delete(product);//删除数据库目标信息。
                 if (count == 0) System.Windows.MessageBox.Show("ERR.C0110-2：删除失败", "错误");//判断执行是否成功
+                else Button_sql = true;
             }
         }