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

MainWindow.xaml.cs

@@ -557,14 +557,15 @@ namespace formula_manage
             Deputy.Content = viewOrder;  //打开订单选择
         }
 
-        public void Recevie_Technology(string value)//订单选择信息传递
+        public void Recevie_Technology(string[] value)//订单选择信息传递
         {
-            Technology.Text = value;
+            Technology.Text = value[1] + "@" + value[0];
+            Procedures_N.Text = value[2];
         }
         private void Button_Technology(object sender, RoutedEventArgs e)
         {
             ViewProcess viewProcess = new ViewProcess();
-            viewProcess.sendMessage = Recevie_Technology;
+                viewProcess.sendMessage = Recevie_Technology;
             Deputy.Content = viewProcess;  //打开工艺选择
         }
 
@@ -952,6 +953,5 @@ namespace formula_manage
             Confirm.IsEnabled = false;
         }
 
-
     }
 }

View/ViewOrder.xaml

@@ -43,7 +43,7 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="订单号" Binding="{Binding OrdeNO}" Width="100" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="工艺名称" Binding="{Binding ProcessNAME}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True"/>
-                <DataGridTextColumn Header="工艺代码" Binding="{Binding ProcessCODE}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True"/>
+                <DataGridTextColumn Header="工艺代码" Binding="{Binding ProcessCODE}" Width="0" FontSize="15" MaxWidth="400" MinWidth="0" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="品名" Binding="{Binding colour}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="客户" Binding="{Binding customer}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
                 <DataGridTextColumn Header="下单时间" Binding="{Binding OrdeTime}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>

View/ViewOrder.xaml.cs

@@ -128,7 +128,7 @@ namespace formula_manage.View
             if (rownum != -1)//判断鼠标定位是否有效
             {
                 /*定位选中行及指定列单元格文本信息*/
-                OrderData[0]=(Order.Columns[0].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                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();//定位第列
@@ -137,7 +137,6 @@ namespace formula_manage.View
                 OrderData[6] = (Order.Columns[6].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
                
                 sendMessage(OrderData); //传入数组
-
             }
         }
 

View/ViewProcess.xaml

@@ -47,7 +47,6 @@
                 <DataGridTextColumn Binding="{Binding PROC_STEP}" Header="步数" Width="50" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Binding="{Binding PROC_FABRIC}" Header="布种" Width="100" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
                 <DataGridTextColumn Binding="{Binding PROC_PRODUCT}" Header="品名" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
-                <DataGridTextColumn Binding="{Binding custom}" Header="客户" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False"/>
                 <DataGridTextColumn Binding="{Binding REMARK}" Header="备注" Width="800" FontSize="15" MinWidth="80" CanUserReorder="False"/>
             </DataGrid.Columns>
         </DataGrid>

View/ViewProcess.xaml.cs

@@ -55,7 +55,7 @@ namespace formula_manage.View
             {
                 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]";//查询语句
+            string order_sql = "SELECT PROC_CODE,PROC_NAME,PROC_TEST,PROC_STEP,MODIFY_TIME,PROC_FABRIC,PROC_PRODUCT,REMARK FROM [Dispensing].[dbo].[PROCEDUR_TITLE]";//查询语句
 
             SqlConnection conn_SC = new SqlConnection(Connstr_SC);  //实例化
             try
@@ -77,17 +77,25 @@ namespace formula_manage.View
             }
         }
 
-        public delegate void SendMessage(string value);
+        public delegate void SendMessage(string[] value);
         public SendMessage sendMessage;
 
+        string[] OrderData = new string[6];
+
         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());//定位第列
+                OrderData[0] = (Technology.Columns[0].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[1] = (Technology.Columns[1].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[2] = (Technology.Columns[2].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[3] = (Technology.Columns[3].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[4] = (Technology.Columns[4].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
+                OrderData[5] = (Technology.Columns[5].GetCellContent(Technology.Items[rownum]) as TextBlock).Text.Trim();//定位第列
 
+                sendMessage(OrderData); //传入数组
             }
         }