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

MainWindow.xaml

@@ -89,10 +89,11 @@
         </Grid>
 
         <DataGrid x:Name="DetailedGrid" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
-                  Margin="5,325,5,100" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
+                  Margin="5,325,5,100" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
                   BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
-                  CanUserDeleteRows="True" CanUserSortColumns="False" LoadingRow="DataGrid_LoadingRow"
+                  CanUserReorderColumns="False" CanUserSortColumns="False" 
+                  CanUserAddRows="False" CanUserDeleteRows="False"
                   Background="White" SelectionMode="Single" FontSize="15" CanUserResizeRows="False">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
@@ -123,24 +124,23 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False"
+                <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" IsReadOnly="True" Binding="{Binding ID}"/>
-                                    IsReadOnly="True" Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"/>
+                <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding PRODUCT_CODE}"/>
-                <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding CONC}"/>
-                <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CanUserReorder="False">
                     <DataGridTemplateColumn.CellTemplate  >
                         <DataTemplate>
-                            <ComboBox x:Name="CUnit" IsEditable="True" >
+                            <ComboBox x:Name="CUnit" IsEditable="True" BindingGroup="{Binding SHIFT}">
                                 <ComboBoxItem Content="%"></ComboBoxItem>
                                 <ComboBoxItem Content="g/L"></ComboBoxItem>
                             </ComboBox>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding PRODUCT_NAME}"/>
-                <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True" Binding="{Binding TARGET_WT}"/>
-                <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>
+                <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False" IsReadOnly="True" Binding="{Binding UNIT}"/>
-                <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False" Binding="{Binding REMARK}"/>
             </DataGrid.Columns>
         </DataGrid>
         <Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="confirm"/>

MainWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -26,8 +27,33 @@ namespace formula_manage
     {
         public MainWindow()
         {
+            int ID_N = 1;
+
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();    
+            
+            DataTable dataTable = new DataTable();
+            dataTable.Columns.Add("ID", typeof(int));
+            dataTable.Columns.Add("PRODUCT_CODE", typeof(string));
+            dataTable.Columns.Add("CONC", typeof(string));
+            dataTable.Columns.Add("SHIFT", typeof(string));
+            dataTable.Columns.Add("PRODUCT_NAME", typeof(string));
+            dataTable.Columns.Add("TARGET_WT", typeof(float));
+            dataTable.Columns.Add("UNIT", typeof(string));
+            dataTable.Columns.Add("REMARK", typeof(string));
+
+            DataRow row = dataTable.NewRow();  //ID列
+            row["ID"] = ID_N;
+            dataTable.Rows.Add(row);
+
+            for (ID_N = 2; ID_N <= 64; ID_N++)
+            {
+                row = dataTable.NewRow();
+                row["ID"] = ID_N;
+                dataTable.Rows.Add(row);
+            }
+            // DetailedGrid.DataContext = dataTable;
+            DetailedGrid.ItemsSource = dataTable.DefaultView;
         }
 
         private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)  //回车跳转功能
@@ -181,11 +207,6 @@ namespace formula_manage
            
         }
 
-        private void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e)  //序号
-        {
-            e.Row.Header = e.Row.GetIndex() + 1;
-        }
-
         private void Weight(object sender, TextChangedEventArgs e) //重量输入框
         {
             float a, b, c;