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

ConvertMoels/ColorSQLConvert.cs

@@ -4,11 +4,18 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels
 {
-    internal class ColorSQLConvert
+   /// <summary>
+    /// RGB色彩数值转换器
+    /// 将色彩数值转换为ARGB代码返回
+    /// </summary>
+    public class ColorSQLConvert : IValueConverter
     {
+        /// <summary>
+        /// </summary>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value != null)

ConvertMoels/ProductTypeSQLConvert.cs

@@ -4,10 +4,11 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Data;
 
 namespace formula_manage.ConvertMoels
 {
-    internal class ProductTypeSQLConvert
+    internal class ProductTypeSQLConvert : IValueConverter
     {
         /// <summary> 
         /// </summary>

Windows/Stuff.xaml

@@ -19,7 +19,9 @@
                   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"
-                 >
+                  CanUserResizeRows="False"  CanUserSortColumns="False" CanUserResizeColumns="False"
+                  CanUserAddRows="False" CanUserDeleteRows="False"
+                  ItemsSource="{Binding Mode=OneWay}">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
@@ -49,13 +51,13 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-           <!--   <DataGridTemplateColumn Header=" 序号" Width="50" MinWidth="10" IsReadOnly="True">
+              <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> -->
+              </DataGridTemplateColumn> 
               <DataGridTextColumn Header="原料代码" Binding="{Binding ProductCode}" Width="130" FontSize="15" MaxWidth="130" MinWidth="100" CanUserReorder="False"/>
               <DataGridTextColumn Header="原料名称" Binding="{Binding ProductName}" Width="200" FontSize="15" MaxWidth="200" MinWidth="200" CanUserReorder="False"/>
               <DataGridTextColumn Header="价格(￥/kg)" Binding="{Binding Price}" Width="100" FontSize="15" MaxWidth="100" MinWidth="100" CanUserReorder="False"/>
@@ -65,7 +67,8 @@
                   <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
                             <!--        <Setter Property="Text" Value="{Binding ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
-                     -->   </Style>
+                           -->
+                        </Style>
                   </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
               <DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">

Windows/Stuff.xaml.cs

@@ -16,6 +16,7 @@ using GalaSoft.MvvmLight;
 using formula_manage.SQLModels;
 using System.Data.SqlClient;
 using System.Data;
+using System.Windows.Forms;
 
 namespace formula_manage.Windows
 {
@@ -38,13 +39,11 @@ namespace formula_manage.Windows
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
-
         }
 
         private async void Stuff_Loaded(object sender, RoutedEventArgs e)//打开页面执行
         {
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
-
             this.DataGridStuff.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号
 
             TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
@@ -72,14 +71,14 @@ namespace formula_manage.Windows
                 Stuff_data.Fill(Stuff_DataSet);       //查询结果存入缓存
                 conn_SC.Close();  //关闭连接
 
-                DataGridStuff.DataContext = Stuff_DataSet;
+                // DataGridStuff.ItemsSource =  Stuff_DataSet.DefaultViewManager;
-                DataGridStuff.ItemsSource = new object[] {Stuff_DataSet };
             }
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
                 return;
             }
+          
         }
          
         /// <summary>