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

Login.xaml.cs

@@ -31,6 +31,8 @@ namespace formula_manage
         string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\Log.txt";//日志文件
         string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]：";
 
+        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
+
         public Login()
         {
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
@@ -83,8 +85,6 @@ namespace formula_manage
             }
         }
 
-        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
-
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;

Windows/Stuff.xaml

@@ -6,8 +6,7 @@
         xmlns:local="clr-namespace:formula_manage.Windows" 
         xmlns:ConvertMoels="clr-namespace:formula_manage.ConvertMoels" 
         xmlns:viewmodel="clr-namespace:formula_manage.ViewModel"       
-         DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
+        mc:Ignorable="d"  Loaded="Stuff_Loaded" 
-        mc:Ignorable="d"
         Title="Stuff" Height="720" Width="1100" BorderBrush="White" Background="#FFE0E0E0">
     <Window.Resources>
         <!--引入转换器-->
@@ -20,7 +19,7 @@
                   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"
-                  ItemsSource="{Binding  Product, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                  ItemsSource="{Binding co}" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
@@ -50,13 +49,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,16 +64,16 @@
                     <!--事件名称：原料类型数字转文字显示，转换器ProductTypeSQLConvert-->
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
-                            <Setter Property="Text" Value="{Binding Path=ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
+                          <!--  <Setter Property="Text" Value="{Binding ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
-                        </Style>
+                     -->   </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 <DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">
                     <!--事件名称：色彩数字转色彩显示，转换器ColorSQLConvert-->
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
-                            <Setter Property="Background"  Value="{Binding Path=Color, Converter={StaticResource ColorSQLConvert}}"/>
+                            <!--      <Setter Property="Background"  Value="{Binding Color, Converter={StaticResource ColorSQLConvert}}"/>
-                        </Style>
+                      -->    </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 <DataGridTextColumn Header="浓度(%)" Binding="{Binding Concentration}" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>

Windows/Stuff.xaml.cs

@@ -14,6 +14,8 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using GalaSoft.MvvmLight;
 using formula_manage.SQLModels;
+using System.Data.SqlClient;
+using System.Data;
 
 namespace formula_manage.Windows
 {
@@ -22,18 +24,67 @@ namespace formula_manage.Windows
     /// </summary>
     public partial class Stuff : Window
     {
-        public Stuff()
+
+        public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
+
+        string TEXT_SQLIP;
+        string TEXT_SQLNAME;
+        string TEXT_SQMOD;
+        string TEXT_SQLUSER;
+        string TEXT_SQLPASWOR;
+        string Connstr_SC;
+
+        public  Stuff()
         {
             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");    //读配置文件
+            TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
+            TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
+            TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
+            TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+            if (TEXT_SQMOD == "0")  //判断连接方式
+            {
+                Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
+            }
+            else
+            {
+                Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
+            }
+
+            string Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY  FROM [Dispensing].[dbo].[PRODUCT]";//查询语句
+
+            SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
+            try
+            {
+                await conn_SC.OpenAsync();    //打开数据连接
+                SqlDataAdapter Stuff_data = new SqlDataAdapter(Stuff_sql,Connstr_SC);   //查询
+                DataSet Stuff_DataSet = new DataSet();       //建立缓存
+                Stuff_data.Fill(Stuff_DataSet);       //查询结果存入缓存
+                conn_SC.Close();  //关闭连接
+
+                DataGridStuff.DataContext = Stuff_DataSet;
+                DataGridStuff.ItemsSource = new object[] {Stuff_DataSet };
+            }
+            catch (Exception)
+            {
+                System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
+                return;
+            }        
         }
 
-        /// <summary>
+            /// <summary>
-        /// 生成序列号的方法
+            /// 生成序列号的方法
-        /// </summary>
+            /// </summary>
         private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
         {
             e.Row.Header = e.Row.GetIndex() + 1;