Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
This commit is contained in:
commit
9858f2fcaf
2 files changed
+5
-9
No files matched your search
+4
-8
@@ -544,20 +544,16 @@ namespace formula_manage
|
|||||||
if (P > 1) Procedures_P.Text = (P - 1).ToString();
|
if (P > 1) Procedures_P.Text = (P - 1).ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Recevie_order(string value)//订单选择信息传递
|
public void Recevie_order(string[] value)//订单选择信息传递
|
||||||
{
|
{
|
||||||
order.Text = value;
|
order.Text = value[0];
|
||||||
|
Technology.Text = value[1]+"@" + value[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Button_Order(object sender, RoutedEventArgs e)
|
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 viewOrder = new ViewOrder();
|
||||||
viewOrder.sendMessage = OrderData;
|
viewOrder.sendMessage = Recevie_order;
|
||||||
|
|
||||||
|
|
||||||
Deputy.Content = viewOrder; //打开订单选择
|
Deputy.Content = viewOrder; //打开订单选择
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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 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 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" Visibility="Collapsed" IsReadOnly="True"/>
|
<DataGridTextColumn Header="工艺代码" Binding="{Binding ProcessCODE}" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" 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 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 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"/>
|
<DataGridTextColumn Header="下单时间" Binding="{Binding OrdeTime}" Width="200" FontSize="15" MaxWidth="200" MinWidth="80" CanUserReorder="False" IsReadOnly="True"/>
|
||||||
|
|||||||
Reference in new issue
Block a user