diff --git a/MainWindow.xaml b/MainWindow.xaml index 1737dde..6933d59 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -67,10 +67,10 @@ - + - + 1) Procedures_P.Text = (P - 1).ToString(); } + public void Recevie_order(string value)//订单选择信息传递 + { + order.Text = value; + } + private void Button_Order(object sender, RoutedEventArgs e) { - Deputy.Content = new View.ViewOrder(); //打开工艺选择 + 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) diff --git a/View/ViewOrder.xaml b/View/ViewOrder.xaml index a9419a7..5a53c2c 100644 --- a/View/ViewOrder.xaml +++ b/View/ViewOrder.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" d:DesignHeight="150" d:DesignWidth="405" Background="#FFE0E0E0"> - - - - - - + -