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

MainWindow.xaml

@@ -67,10 +67,10 @@
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
         <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True" Grid.Column="1"/>
         <TextBox x:Name="Number" HorizontalAlignment="Left" ToolTip="当前配方的物料单" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="order" HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <TextBox x:Name="ReDye" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 
                  MaxLines="1" MaxLength="2" Grid.Column="1" IsReadOnly="True"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Technology" HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <ComboBox x:Name="Machine" DisplayMemberPath="Name"
                   ItemsSource="{Binding mac_Machine, Source={StaticResource MainWindowViewModel}}" 
                   HorizontalAlignment="Left" Height="30" Margin="95,140,0,0" VerticalAlignment="Top" Width="120" FontSize="20"

MainWindow.xaml.cs

@@ -34,6 +34,7 @@ using System.Diagnostics;
 using System.Printing;
 using System.Drawing.Printing;
 using static System.Drawing.Printing.PrinterSettings;
+using formula_manage.View;
 
 namespace formula_manage
 {
@@ -543,14 +544,32 @@ namespace formula_manage
             if (P > 1) Procedures_P.Text = (P - 1).ToString();
         }
 
-        private void Button_Order(object sender, RoutedEventArgs e)
+        public void Recevie_order(string value)//订单选择信息传递
         {
-            Deputy.Content = new View.ViewOrder();  //打开工艺选择
+            order.Text = value;
         }
 
+        private void Button_Order(object sender, RoutedEventArgs e)
+        {
+            string[] OrderData = new string[7];
+            OrderData[0] = Recevie_order;
+            OrderData[2] = Recevie_Technology;
+            ViewOrder viewOrder = new ViewOrder();
+            viewOrder.sendMessage = OrderData;
+
+
+            Deputy.Content = viewOrder;  //打开订单选择
+        }
+
+        public void Recevie_Technology(string value)//订单选择信息传递
+        {
+            Technology.Text = value;
+        }
         private void Button_Technology(object sender, RoutedEventArgs e)
         {
-            Deputy.Content = new View.ViewProcess();  //打开工艺选择
+            ViewProcess viewProcess = new ViewProcess();
+            viewProcess.sendMessage = Recevie_Technology;
+            Deputy.Content = viewProcess;  //打开工艺选择
         }
 
         private void Button_Formula(object sender, RoutedEventArgs e)

View/ViewOrder.xaml

@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="150" d:DesignWidth="405" Background="#FFE0E0E0">
     <Grid>
-        <DataGrid x:Name="Order" AlternationCount="2" IsReadOnly="True"
+        <DataGrid x:Name="Order" AlternationCount="2" IsReadOnly="True" MouseDoubleClick="DataGridOrder_MouseDoubleClick"
                    HeadersVisibility ="Column" Margin="0,0,0,40"  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"  
@@ -50,13 +50,9 @@
                 <DataGridTextColumn Header="备注" Binding="{Binding REMARK}" Width="800" FontSize="15" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        <ComboBox x:Name="condition" HorizontalAlignment="Left" Height="30" Width="100" VerticalAlignment="Bottom" FontSize="20" Margin="5,0,0,5">
+        <ComboBox x:Name="condition" HorizontalAlignment="Left" Height="30" Width="100" VerticalAlignment="Bottom" FontSize="20" Margin="5,0,0,5"/>
-            <ComboBoxItem Content="工艺"></ComboBoxItem>
-            <ComboBoxItem Content="客户"></ComboBoxItem>
-            <ComboBoxItem Content="品名"></ComboBoxItem>
-        </ComboBox>
         <TextBox x:Name="search" HorizontalAlignment="Left" Height="30" Margin="110,0,0,5" TextWrapping="Wrap" VerticalAlignment="Bottom" Width="200" FontSize="20"/>
-        <Button Content="搜索" Height="30" Margin="315,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="50" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" />
+        <Button Content="搜索" Click="Button_search" Height="30" Margin="315,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="50" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" />
 
     </Grid>
 </UserControl>

View/ViewOrder.xaml.cs

@@ -14,6 +14,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using FastReport.Editor;
+using FastReport.DevComponents.DotNetBar;
 
 namespace formula_manage.View
 {
@@ -31,9 +33,17 @@ namespace formula_manage.View
         string TEXT_SQLPASWOR;
         string Connstr_SC;
 
+        DataTable dataTable = new DataTable();   //建立缓存
+
         public ViewOrder()
         {
             InitializeComponent();
+
+            condition.Items.Add("");
+            condition.Items.Add("工艺");
+            condition.Items.Add("客户");
+            condition.Items.Add("品名");
+
             sql_();
         }
 
@@ -53,15 +63,15 @@ namespace formula_manage.View
             {
                 Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
             }
-            string MAC_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
+            string order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
 
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
             try
             {
                 await conn_SC.OpenAsync();    //打开数据连接
-                SqlDataAdapter Stuff_data = new SqlDataAdapter(MAC_sql, Connstr_SC);   //查询
+                SqlDataAdapter Stuff_data = new SqlDataAdapter(order_sql, Connstr_SC);   //查询
 
-                DataTable dataTable = new DataTable();   //建立缓存
+                dataTable.Clear();
                 Stuff_data.Fill(dataTable);    //查询结果存入缓存  
                 conn_SC.Close();  //关闭连接
 
@@ -74,5 +84,62 @@ namespace formula_manage.View
                 return;
             }
         }
+
+        private async void Button_search(object sender, RoutedEventArgs e)//搜索按钮
+        {
+            int a;
+            string order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
+           
+            a = condition.SelectedIndex;  //获取选择条件
+
+            if(a==1) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where ProcessNAME = '"+ search.Text + "' order by OrdeTime desc";//查询语句
+            else if(a==2) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where customer = '" + search.Text + "' order by OrdeTime desc";//查询语句
+            else if (a == 3) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where colour = '" + search.Text + "' order by OrdeTime desc";//查询语句
+            else if (a == 0) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
+
+
+            SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
+            try
+            {
+                await conn_SC.OpenAsync();    //打开数据连接
+                SqlDataAdapter Stuff_data = new SqlDataAdapter(order_sql, Connstr_SC);   //查询
+
+                dataTable.Clear();
+                Stuff_data.Fill(dataTable);    //查询结果存入缓存  
+                conn_SC.Close();  //关闭连接
+
+                Order.ItemsSource = dataTable.DefaultView; //数据加入表格
+                //Order.DisplayMemberPath = "Name";
+            }
+            catch (Exception)
+            {
+                System.Windows.MessageBox.Show("请求信息失败");
+                return;
+            }
+        }
+
+        public delegate void SendMessage(string[] value);
+        public SendMessage sendMessage;
+
+        string[] OrderData = new string[7];
+        private void DataGridOrder_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
+        {
+            int rownum = Order.SelectedIndex;//获取鼠标选中行并定义变量
+            if (rownum != -1)//判断鼠标定位是否有效
+            {
+                /*定位选中行及指定列单元格文本信息*/
+                OrderData[0]=(Order.Columns[0].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[1] = (Order.Columns[1].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[2] = (Order.Columns[2].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[3] = (Order.Columns[3].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[4] = (Order.Columns[4].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[5] = (Order.Columns[5].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[6] = (Order.Columns[6].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+               
+                sendMessage(OrderData); //传入数组
+
+            }
+        }
+
     }
 }

View/ViewProcess.xaml

@@ -7,10 +7,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="150" d:DesignWidth="405">
     <Grid>
-        <DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" 
+        <DataGrid x:Name="Technology" AlternationCount="2" IsReadOnly="True" MouseDoubleClick="DataGrid_Technology"
-      Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
+                  HeadersVisibility ="Column" Margin="0,0,0,0" AutoGenerateColumns="False" MinColumnWidth="30"
-      HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
+                  HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
-      BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" 
+                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" 
                    CanUserSortColumns="False" 
                   Background="White" SelectionMode="Single">
             <DataGrid.RowStyle >
@@ -42,13 +42,13 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="工艺代码" Width="100" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding PROC_CODE}" Header="工艺代码" Width="100" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
-                <DataGridTextColumn Header="工艺名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding PROC_NAME}" Header="工艺名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
-                <DataGridTextColumn Header="步数" Width="50" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding PROC_STEP}" Header="步数" Width="50" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
-                <DataGridTextColumn Header="布种" Width="100" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding PROC_FABRIC}" Header="布种" Width="100" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
-                <DataGridTextColumn Header="品名" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding PROC_PRODUCT}" Header="品名" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
-                <DataGridTextColumn Header="客户" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding custom}" Header="客户" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
-                <DataGridTextColumn Header="备注" Width="800" FontSize="15" MinWidth="80" CanUserReorder="False"/>
+                <DataGridTextColumn Binding="{Binding REMARK}" Header="备注" Width="800" FontSize="15" MinWidth="80" CanUserReorder="False"/>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

View/ViewProcess.xaml.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -20,9 +22,74 @@ namespace formula_manage.View
     /// </summary>
     public partial class ViewProcess : UserControl
     {
+        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;
+
+        DataTable dataTable = new DataTable();   //建立缓存
+
         public ViewProcess()
         {
             InitializeComponent();
+            sql_();
         }
+
+        private async void sql_()
+        {
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
+            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 order_sql = "SELECT PROC_CODE,PROC_NAME,PROC_TEST,PROC_STEP,MODIFY_TIME,PROC_FABRIC,PROC_PRODUCT,custom,REMARK FROM [Dispensing].[dbo].[PROCEDUR_TITLE]";//查询语句
+
+            SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
+            try
+            {
+                await conn_SC.OpenAsync();    //打开数据连接
+                SqlDataAdapter Stuff_data = new SqlDataAdapter(order_sql, Connstr_SC);   //查询
+
+                dataTable.Clear();
+                Stuff_data.Fill(dataTable);    //查询结果存入缓存  
+                conn_SC.Close();  //关闭连接
+
+                Technology.ItemsSource = dataTable.DefaultView; //数据加入表格
+                //Order.DisplayMemberPath = "Name";
+            }
+            catch (Exception)
+            {
+                System.Windows.MessageBox.Show("请求信息失败");
+                return;
+            }
+        }
+
+        public delegate void SendMessage(string value);
+        public SendMessage sendMessage;
+
+        private void DataGrid_Technology(object sender, MouseButtonEventArgs e)//数据表双击事件
+        {
+            int rownum = Technology.SelectedIndex;//获取鼠标选中行并定义变量
+            if (rownum != -1)//判断鼠标定位是否有效
+            {
+                /*定位选中行及指定列单元格文本信息*/
+                sendMessage((Technology.Columns[0].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim());//定位第列
+
+            }
+        }
+
     }
 }