@@ -1368,7 +1368,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model | |||||
double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds; | double a = DateTime.Now.Subtract(GVL_BigStation.DosingRecipe1Time).TotalSeconds; | ||||
FinishData.ProcessTime = Convert.ToInt16(a); | FinishData.ProcessTime = Convert.ToInt16(a); | ||||
SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361); | SiemensDevice.Siemens_PLC_S7.WriteClass<DL_Finish_DB>(FinishData, 2361); | ||||
MessageNotify.GetInstance.ShowRunLog($"配方1,,配方编号:{code},托盘编号:{trayCode},配料完成,将信号反馈给西门子"); | |||||
MessageNotify.GetInstance.ShowRunLog($"配方1,配方编号:{code},托盘编号:{trayCode},配料完成,将信号反馈给西门子"); | |||||
} | } | ||||
HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true); | HKDevice.HK_PLC_S7.Write("DB99.DBX1.4", true); | ||||
GVL_BigStation.Recipe1DosingStatus = 3; | GVL_BigStation.Recipe1DosingStatus = 3; | ||||
@@ -1382,7 +1382,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model | |||||
Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | ||||
}); | }); | ||||
GVL_BigStation.Recipe1DosingStatus = 0; | GVL_BigStation.Recipe1DosingStatus = 0; | ||||
MessageNotify.GetInstance.ShowRunLog($"配方1,,配方编号:{code},托盘编号:{trayCode},复位plc配料完成信号"); | |||||
MessageNotify.GetInstance.ShowRunLog($"配方1,配方编号:{code},托盘编号:{trayCode},复位plc配料完成信号"); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -1496,7 +1496,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model | |||||
Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | ||||
}); | }); | ||||
GVL_BigStation.Recipe2DosingStatus = 0; | GVL_BigStation.Recipe2DosingStatus = 0; | ||||
MessageNotify.GetInstance.ShowRunLog($"配方2,,配方编号:{code},托盘编号:{trayCode},,复位plc配料完成信号"); | |||||
MessageNotify.GetInstance.ShowRunLog($"配方2,配方编号:{code},托盘编号:{trayCode},,复位plc配料完成信号"); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -1609,7 +1609,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model | |||||
Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | Json<RemoteRecipe>.Data.Recipes.RemoveAt(index);//制作完成,移除当前配方 | ||||
}); | }); | ||||
GVL_BigStation.Recipe3DosingStatus = 0; | GVL_BigStation.Recipe3DosingStatus = 0; | ||||
MessageNotify.GetInstance.ShowRunLog($"配方3,,配方编号:{code},托盘编号:{trayCode},复位plc配料完成信号"); | |||||
MessageNotify.GetInstance.ShowRunLog($"配方3,配方编号:{code},托盘编号:{trayCode},复位plc配料完成信号"); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -1,16 +1,18 @@ | |||||
<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.ManualFlowView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
mc:Ignorable="d" | |||||
d:DesignHeight="1080" d:DesignWidth="1920"> | |||||
<UserControl | |||||
x:Class="BPASmartClient.JXJFoodBigStation.View.ManualFlowView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
d:DesignHeight="1080" | |||||
d:DesignWidth="1920" | |||||
mc:Ignorable="d"> | |||||
<UserControl.DataContext> | <UserControl.DataContext> | ||||
<vm:ManualFlowViewModel /> | <vm:ManualFlowViewModel /> | ||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<Grid Margin="10"> | <Grid Margin="10"> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="50" /> | <RowDefinition Height="50" /> | ||||
@@ -20,213 +22,415 @@ | |||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<!--#region 表格标题栏设置--> | <!--#region 表格标题栏设置--> | ||||
<Grid> | <Grid> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center"> | |||||
<StackPanel | |||||
HorizontalAlignment="left" | |||||
VerticalAlignment="Center" | |||||
Orientation="Horizontal"> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayInPlace}" | Command="{Binding TrayInPlace}" | ||||
CommandParameter="1" | CommandParameter="1" | ||||
Content="AGV到达工位1" | Content="AGV到达工位1" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayInPlace}" | Command="{Binding TrayInPlace}" | ||||
CommandParameter="2" | CommandParameter="2" | ||||
Content="AGV到达工位2" | Content="AGV到达工位2" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayInPlace}" | Command="{Binding TrayInPlace}" | ||||
CommandParameter="3" | CommandParameter="3" | ||||
Content="AGV到达工位3" | Content="AGV到达工位3" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayInPlace}" | Command="{Binding TrayInPlace}" | ||||
CommandParameter="4" | CommandParameter="4" | ||||
Content="AGV到达工位4" | Content="AGV到达工位4" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayInPlace}" | Command="{Binding TrayInPlace}" | ||||
CommandParameter="5" | CommandParameter="5" | ||||
Content="AGV到达工位5" | Content="AGV到达工位5" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="1"> | <Grid Grid.Row="1"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center"> | |||||
<StackPanel | |||||
HorizontalAlignment="left" | |||||
VerticalAlignment="Center" | |||||
Orientation="Horizontal"> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayLeave}" | Command="{Binding TrayLeave}" | ||||
CommandParameter="1" | CommandParameter="1" | ||||
Content="AGV离开工位1" | Content="AGV离开工位1" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayLeave}" | Command="{Binding TrayLeave}" | ||||
CommandParameter="2" | CommandParameter="2" | ||||
Content="AGV离开工位2" | Content="AGV离开工位2" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayLeave}" | Command="{Binding TrayLeave}" | ||||
CommandParameter="3" | CommandParameter="3" | ||||
Content="AGV离开工位3" | Content="AGV离开工位3" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayLeave}" | Command="{Binding TrayLeave}" | ||||
CommandParameter="4" | CommandParameter="4" | ||||
Content="AGV离开工位4" | Content="AGV离开工位4" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding TrayLeave}" | Command="{Binding TrayLeave}" | ||||
CommandParameter="5" | CommandParameter="5" | ||||
Content="AGV离开工位5" | Content="AGV离开工位5" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="2"> | <Grid Grid.Row="2"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="left" VerticalAlignment="Center"> | |||||
<StackPanel | |||||
HorizontalAlignment="left" | |||||
VerticalAlignment="Center" | |||||
Orientation="Horizontal"> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding ClearTrayInPlace}" | Command="{Binding ClearTrayInPlace}" | ||||
Content="清除AGV到位信号" | Content="清除AGV到位信号" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
<Button | <Button | ||||
Width="200" | Width="200" | ||||
Height="40" | Height="40" | ||||
Margin="5,0,5,0" | Margin="5,0,5,0" | ||||
Panel.ZIndex="0" | |||||
Command="{Binding ClearAllRecipe}" | Command="{Binding ClearAllRecipe}" | ||||
Content="清除西门子所有配方" | Content="清除西门子所有配方" | ||||
FontSize="20" | FontSize="20" | ||||
Panel.ZIndex="0" | |||||
Style="{StaticResource ImageButtonStyle}"></Button> | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="3"> | <Grid Grid.Row="3"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<StackPanel> | <StackPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="plc心跳:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding Heartbeat}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="10"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="plc心跳:" /> | |||||
<TextBlock | |||||
Margin="10" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding Heartbeat}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="订单号:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBox Width="300" Margin="5" Text="{Binding CancelRecipeCode}" FontSize="24" VerticalAlignment="Center"></TextBox> | |||||
<Button Style="{StaticResource ImageButtonStyle}" Width="120" Height="40" FontSize="20" Content="取消订单" Margin="5" Command="{Binding CancelRecipeCommand}"></Button> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="订单号:" /> | |||||
<TextBox | |||||
Width="300" | |||||
Margin="5" | |||||
VerticalAlignment="Center" | |||||
FontSize="24" | |||||
Text="{Binding CancelRecipeCode}" /> | |||||
<Button | |||||
Width="120" | |||||
Height="40" | |||||
Margin="5" | |||||
Command="{Binding CancelRecipeCommand}" | |||||
Content="取消订单" | |||||
FontSize="20" | |||||
Style="{StaticResource ImageButtonStyle}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Grid.Column="3"> | <StackPanel Grid.Column="3"> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBinName}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBinName}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓1名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin1Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓1名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin1Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓2名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin2Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓2名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin2Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓3名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin3Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓3名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin3Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓4名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin4Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓4名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin4Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓5名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin5Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓5名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin5Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓6名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin6Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓6名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin6Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓7名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin7Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓7名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin7Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓8名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin8Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓8名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin8Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓9名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin9Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓9名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin9Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓10名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin10Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓10名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin10Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓11名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin11Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓11名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin11Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓12名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin12Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓12名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin12Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓13名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin13Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓13名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin13Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
<WrapPanel> | <WrapPanel> | ||||
<TextBlock Text="料仓14名称:" Foreground="#FF2AB2E7" FontSize="25" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock> | |||||
<TextBlock Text="{Binding StockBin14Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="5"></TextBlock> | |||||
<TextBlock | |||||
Margin="10,0,5,0" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="料仓14名称:" /> | |||||
<TextBlock | |||||
Margin="5" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="25" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding StockBin14Name}" /> | |||||
</WrapPanel> | </WrapPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
@@ -12,7 +12,7 @@ | |||||
d:DesignWidth="800" | d:DesignWidth="800" | ||||
mc:Ignorable="d"> | mc:Ignorable="d"> | ||||
<UserControl.DataContext> | <UserControl.DataContext> | ||||
<vm:RecipeReceiveViewModel/> | |||||
<vm:RecipeReceiveViewModel /> | |||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<UserControl.Resources> | <UserControl.Resources> | ||||
@@ -107,15 +107,15 @@ | |||||
<DockPanel> | <DockPanel> | ||||
<ToggleButton | <ToggleButton | ||||
x:Name="HeaderSite" | x:Name="HeaderSite" | ||||
Height="20" | |||||
Width="auto" | Width="auto" | ||||
Height="20" | |||||
MinWidth="0" | MinWidth="0" | ||||
MinHeight="0" | MinHeight="0" | ||||
Margin="1" | Margin="1" | ||||
Padding="{TemplateBinding Padding}" | Padding="{TemplateBinding Padding}" | ||||
Background="Transparent" | |||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | ||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | ||||
Background="Transparent" | |||||
Content="{TemplateBinding Header}" | Content="{TemplateBinding Header}" | ||||
ContentTemplate="{TemplateBinding HeaderTemplate}" | ContentTemplate="{TemplateBinding HeaderTemplate}" | ||||
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ||||
@@ -152,20 +152,20 @@ | |||||
<Grid> | <Grid> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="50"/> | |||||
<RowDefinition Height="50" /> | |||||
<RowDefinition /> | <RowDefinition /> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> | <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> | ||||
<CheckBox | <CheckBox | ||||
x:Name="IsUseLocalRecipe" | x:Name="IsUseLocalRecipe" | ||||
Margin="0,0,10,0" | Margin="0,0,10,0" | ||||
VerticalAlignment="Center" | |||||
Content="使用本地配方配料" | Content="使用本地配方配料" | ||||
FontFamily="楷体" | FontFamily="楷体" | ||||
VerticalAlignment="Center" | |||||
Foreground="Aqua" | Foreground="Aqua" | ||||
IsChecked="{Binding IsUseLocalRecipe}" /> | IsChecked="{Binding IsUseLocalRecipe}" /> | ||||
<!--<pry:IcoButton | |||||
<!--<pry:IcoButton | |||||
Width="140" | Width="140" | ||||
Margin="10" | Margin="10" | ||||
HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
@@ -175,8 +175,8 @@ | |||||
Foreground="Aqua" | Foreground="Aqua" | ||||
IcoText="" | IcoText="" | ||||
Style="{StaticResource IcoButtonStyle}" />--> | Style="{StaticResource IcoButtonStyle}" />--> | ||||
<pry:IcoButton | |||||
<pry:IcoButton | |||||
Width="140" | Width="140" | ||||
Margin="10" | Margin="10" | ||||
HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
@@ -186,7 +186,7 @@ | |||||
Foreground="Aqua" | Foreground="Aqua" | ||||
IcoText="" | IcoText="" | ||||
Style="{StaticResource IcoButtonStyle}" /> | Style="{StaticResource IcoButtonStyle}" /> | ||||
<!--<pry:IcoButton | |||||
<!--<pry:IcoButton | |||||
Width="140" | Width="140" | ||||
Margin="10" | Margin="10" | ||||
HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
@@ -212,20 +212,19 @@ | |||||
</StackPanel> | </StackPanel> | ||||
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden"> | <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden"> | ||||
<ListBox | <ListBox | ||||
Grid.Row="2" | |||||
Margin="5" | |||||
VerticalAlignment="Top" | |||||
Background="Transparent" | |||||
BorderThickness="0" | |||||
ItemsSource="{Binding Recipes}" | |||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"> | |||||
Grid.Row="2" | |||||
Margin="5" | |||||
VerticalAlignment="Top" | |||||
Background="Transparent" | |||||
BorderThickness="0" | |||||
ItemsSource="{Binding Recipes}" | |||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"> | |||||
<ListBox.ItemsPanel> | <ListBox.ItemsPanel> | ||||
<ItemsPanelTemplate> | <ItemsPanelTemplate> | ||||
<UniformGrid | <UniformGrid | ||||
HorizontalAlignment="Left" | |||||
VerticalAlignment="Top" | |||||
Columns="8" /> | |||||
HorizontalAlignment="Left" | |||||
VerticalAlignment="Top" | |||||
Columns="8" /> | |||||
</ItemsPanelTemplate> | </ItemsPanelTemplate> | ||||
</ListBox.ItemsPanel> | </ListBox.ItemsPanel> | ||||
@@ -233,9 +232,9 @@ | |||||
<DataTemplate> | <DataTemplate> | ||||
<Grid | <Grid | ||||
Name="tt" | |||||
Height="220" | |||||
Margin="5"> | |||||
Name="tt" | |||||
Height="220" | |||||
Margin="5"> | |||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="30" /> | <RowDefinition Height="30" /> | ||||
<RowDefinition Height="25" /> | <RowDefinition Height="25" /> | ||||
@@ -247,105 +246,105 @@ | |||||
<RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Image | <Image | ||||
Grid.RowSpan="8" | |||||
Grid.ColumnSpan="2" | |||||
Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png" | |||||
Stretch="Fill" /> | |||||
Grid.RowSpan="8" | |||||
Grid.ColumnSpan="2" | |||||
Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png" | |||||
Stretch="Fill" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="0" | |||||
Grid.ColumnSpan="2" | |||||
FontSize="14" | |||||
Margin="5,0,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方信息" /> | |||||
Grid.Row="0" | |||||
Grid.ColumnSpan="2" | |||||
Margin="5,0,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="14" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方信息" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方名称:" /> | |||||
Grid.Row="1" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方名称:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeName}" /> | |||||
Grid.Row="1" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeName}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="2" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方编号:" /> | |||||
Grid.Row="2" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="2" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeCode}" /> | |||||
Grid.Row="2" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeCode}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="3" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="托盘编号:" /> | |||||
Grid.Row="3" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="托盘编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="3" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding TrayCode}" /> | |||||
Grid.Row="3" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding TrayCode}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="4" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="订单类型:" /> | |||||
Grid.Row="4" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="订单类型:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="4" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding OrderType}" /> | |||||
Grid.Row="4" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding OrderType}" /> | |||||
<!--<ScrollViewer | <!--<ScrollViewer | ||||
Grid.Row="5" | Grid.Row="5" | ||||
VerticalAlignment="Top" | VerticalAlignment="Top" | ||||
@@ -394,22 +393,22 @@ | |||||
</ScrollViewer>--> | </ScrollViewer>--> | ||||
<Image | <Image | ||||
Grid.Row="6" | |||||
Grid.ColumnSpan="2" | |||||
Width="{Binding ElementName=tt, Path=ActualWidth}" | |||||
Height="2" | |||||
VerticalAlignment="Bottom" | |||||
Source="/BPASmartClient.CustomResource;component/Image/直线.png" | |||||
Stretch="Fill" /> | |||||
Grid.Row="6" | |||||
Grid.ColumnSpan="2" | |||||
Width="{Binding ElementName=tt, Path=ActualWidth}" | |||||
Height="2" | |||||
VerticalAlignment="Bottom" | |||||
Source="/BPASmartClient.CustomResource;component/Image/直线.png" | |||||
Stretch="Fill" /> | |||||
<Grid | <Grid | ||||
Name="gr" | |||||
Grid.Row="7" | |||||
Grid.ColumnSpan="2" | |||||
Height="30" | |||||
Margin="0,0,0,10" | |||||
VerticalAlignment="Bottom" | |||||
Background="Transparent"> | |||||
Name="gr" | |||||
Grid.Row="7" | |||||
Grid.ColumnSpan="2" | |||||
Height="30" | |||||
Margin="0,0,0,10" | |||||
VerticalAlignment="Bottom" | |||||
Background="Transparent"> | |||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition /> | <ColumnDefinition /> | ||||
<ColumnDefinition /> | <ColumnDefinition /> | ||||
@@ -441,41 +440,40 @@ | |||||
Style="{StaticResource IcoButtonStyle}" />--> | Style="{StaticResource IcoButtonStyle}" />--> | ||||
<pry:IcoButton | <pry:IcoButton | ||||
Grid.Column="1" | |||||
Width="{Binding ElementName=gr, Path=ActualWidth}" | |||||
Height="{Binding ElementName=gr, Path=ActualHeight}" | |||||
Margin="3,4,4,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Background="#11F53F62" | |||||
BorderThickness="0" | |||||
Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" | |||||
CommandParameter="{Binding RecipeCode}" | |||||
Content="删除" | |||||
EnterBackground="#22F53F62" | |||||
Foreground="#FFF53F62" | |||||
IcoText="" | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
Grid.Column="1" | |||||
Width="{Binding ElementName=gr, Path=ActualWidth}" | |||||
Height="{Binding ElementName=gr, Path=ActualHeight}" | |||||
Margin="3,4,4,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Background="#11F53F62" | |||||
BorderThickness="0" | |||||
Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" | |||||
CommandParameter="{Binding RecipeCode}" | |||||
Content="删除" | |||||
EnterBackground="#22F53F62" | |||||
Foreground="#FFF53F62" | |||||
IcoText="" | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
<pry:IcoButton | <pry:IcoButton | ||||
Width="{Binding ElementName=gr, Path=ActualWidth}" | |||||
Height="{Binding ElementName=gr, Path=ActualHeight}" | |||||
Margin="3,4,4,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Background="#112AB2E7" | |||||
BorderThickness="0" | |||||
Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" | |||||
CommandParameter="{Binding RecipeCode}" | |||||
Content="编辑" | |||||
EnterBackground="#222AB2E7" | |||||
Foreground="#FF2AB2E7" | |||||
IcoText="" | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
Width="{Binding ElementName=gr, Path=ActualWidth}" | |||||
Height="{Binding ElementName=gr, Path=ActualHeight}" | |||||
Margin="3,4,4,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Background="#112AB2E7" | |||||
BorderThickness="0" | |||||
Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}" | |||||
CommandParameter="{Binding RecipeCode}" | |||||
Content="编辑" | |||||
EnterBackground="#222AB2E7" | |||||
Foreground="#FF2AB2E7" | |||||
IcoText="" | |||||
Style="{StaticResource IcoButtonStyle}" /> | |||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
</DataTemplate> | </DataTemplate> | ||||
@@ -1,21 +1,23 @@ | |||||
<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.RecipeSendDownView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter" | |||||
xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
mc:Ignorable="d" | |||||
d:DesignHeight="450" d:DesignWidth="800"> | |||||
<UserControl | |||||
x:Class="BPASmartClient.JXJFoodBigStation.View.RecipeSendDownView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
d:DesignHeight="450" | |||||
d:DesignWidth="800" | |||||
mc:Ignorable="d"> | |||||
<UserControl.DataContext> | <UserControl.DataContext> | ||||
<vm:RecipeSendDownViewModel/> | |||||
<vm:RecipeSendDownViewModel /> | |||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<UserControl.Resources> | <UserControl.Resources> | ||||
<con:EnbleConvert x:Key="EnbleConvert"/> | |||||
<con:IntToSourceConvert x:Key="IntToSourceConvert"/> | |||||
<con:RunStatusConvert x:Key="RunStatusConvert"/> | |||||
<con:EnbleConvert x:Key="EnbleConvert" /> | |||||
<con:IntToSourceConvert x:Key="IntToSourceConvert" /> | |||||
<con:RunStatusConvert x:Key="RunStatusConvert" /> | |||||
<Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem"> | <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem"> | ||||
<Style.Resources> | <Style.Resources> | ||||
<!-- SelectedItem with focus --> | <!-- SelectedItem with focus --> | ||||
@@ -374,15 +376,15 @@ | |||||
<DockPanel> | <DockPanel> | ||||
<ToggleButton | <ToggleButton | ||||
x:Name="HeaderSite" | x:Name="HeaderSite" | ||||
Height="20" | |||||
Width="auto" | Width="auto" | ||||
Height="20" | |||||
MinWidth="0" | MinWidth="0" | ||||
MinHeight="0" | MinHeight="0" | ||||
Margin="1" | Margin="1" | ||||
Padding="{TemplateBinding Padding}" | Padding="{TemplateBinding Padding}" | ||||
Background="Transparent" | |||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | ||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | ||||
Background="Transparent" | |||||
Content="{TemplateBinding Header}" | Content="{TemplateBinding Header}" | ||||
ContentTemplate="{TemplateBinding HeaderTemplate}" | ContentTemplate="{TemplateBinding HeaderTemplate}" | ||||
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ||||
@@ -456,104 +458,104 @@ | |||||
<RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition></ColumnDefinition> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Image | <Image | ||||
Grid.RowSpan="8" | |||||
Grid.ColumnSpan="2" | |||||
Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png" | |||||
Stretch="Fill" /> | |||||
Grid.RowSpan="8" | |||||
Grid.ColumnSpan="2" | |||||
Source="/BPASmartClient.CustomResource;component/Image/配方背景/竖背景框.png" | |||||
Stretch="Fill" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="0" | |||||
Grid.ColumnSpan="2" | |||||
FontSize="14" | |||||
Margin="5,0,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方信息" /> | |||||
Grid.Row="0" | |||||
Grid.ColumnSpan="2" | |||||
Margin="5,0,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="14" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方信息" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方名称:" /> | |||||
Grid.Row="1" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方名称:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeName}" /> | |||||
Grid.Row="1" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeName}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="2" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方编号:" /> | |||||
Grid.Row="2" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="配方编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="2" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeCode}" /> | |||||
Grid.Row="2" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RecipeCode}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="3" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="托盘编号:" /> | |||||
Grid.Row="3" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="托盘编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="3" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding TrayCode}" /> | |||||
Grid.Row="3" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding TrayCode}" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="4" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="订单类型:" /> | |||||
Grid.Row="4" | |||||
Grid.Column="0" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="订单类型:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="4" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding OrderType}" /> | |||||
Grid.Row="4" | |||||
Grid.Column="1" | |||||
Margin="2,5,0,0" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="12" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding OrderType}" /> | |||||
<!--<ScrollViewer | <!--<ScrollViewer | ||||
Grid.Row="2" | Grid.Row="2" | ||||
@@ -601,7 +603,7 @@ | |||||
</ItemsControl> | </ItemsControl> | ||||
</ScrollViewer>--> | </ScrollViewer>--> | ||||
<Image | <Image | ||||
Grid.Row="6" | Grid.Row="6" | ||||
Grid.ColumnSpan="2" | Grid.ColumnSpan="2" | ||||
@@ -923,11 +925,13 @@ | |||||
</ItemsControl> | </ItemsControl> | ||||
</Grid> | </Grid> | ||||
--><!--<TreeView x:Name="repiceListMaking" ItemsSource="{Binding RecipeProcesse}" | |||||
--> | |||||
<!--<TreeView x:Name="repiceListMaking" ItemsSource="{Binding RecipeProcesse}" | |||||
ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat" ItemContainerStyle="{StaticResource recipeTreeItem}"> | ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat" ItemContainerStyle="{StaticResource recipeTreeItem}"> | ||||
</TreeView>--> | </TreeView>--> | ||||
<!-- 等待和已完成 --><!-- | |||||
<!-- 等待和已完成 --> | |||||
<!-- | |||||
<TreeView | <TreeView | ||||
x:Name="repiceList" | x:Name="repiceList" | ||||
@@ -1,28 +1,30 @@ | |||||
<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.SiemensRecipeSendDownView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter" | |||||
xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
mc:Ignorable="d" | |||||
d:DesignHeight="450" d:DesignWidth="800"> | |||||
<UserControl | |||||
x:Class="BPASmartClient.JXJFoodBigStation.View.SiemensRecipeSendDownView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:con="clr-namespace:BPASmartClient.JXJFoodBigStation.Converter" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:local="clr-namespace:BPASmartClient.JXJFoodBigStation.View" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
d:DesignHeight="450" | |||||
d:DesignWidth="800" | |||||
mc:Ignorable="d"> | |||||
<UserControl.DataContext> | <UserControl.DataContext> | ||||
<vm:SiemensRecipeSendDownViewModel/> | |||||
<vm:SiemensRecipeSendDownViewModel /> | |||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<UserControl.Resources> | <UserControl.Resources> | ||||
<con:EnbleConvert x:Key="EnbleConvert"/> | |||||
<con:IntToSourceConvert x:Key="IntToSourceConvert"/> | |||||
<con:RunStatusConvert x:Key="RunStatusConvert"/> | |||||
<con:EnbleConvert x:Key="EnbleConvert" /> | |||||
<con:IntToSourceConvert x:Key="IntToSourceConvert" /> | |||||
<con:RunStatusConvert x:Key="RunStatusConvert" /> | |||||
<Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem"> | <Style x:Key="UserItemContainerStyle" TargetType="ListBoxItem"> | ||||
<Style.Resources> | <Style.Resources> | ||||
<!-- SelectedItem with focus --> | <!-- SelectedItem with focus --> | ||||
<SolidColorBrush | <SolidColorBrush | ||||
x:Key="{x:Static SystemColors.HighlightBrushKey}" | x:Key="{x:Static SystemColors.HighlightBrushKey}" | ||||
Opacity=".4" | Opacity=".4" | ||||
Color="White" /> | |||||
Color="White" /> | |||||
<!-- SelectedItem without focus --> | <!-- SelectedItem without focus --> | ||||
<SolidColorBrush | <SolidColorBrush | ||||
x:Key="{x:Static SystemColors.ControlBrushKey}" | x:Key="{x:Static SystemColors.ControlBrushKey}" | ||||
@@ -362,15 +364,15 @@ | |||||
<DockPanel> | <DockPanel> | ||||
<ToggleButton | <ToggleButton | ||||
x:Name="HeaderSite" | x:Name="HeaderSite" | ||||
Height="20" | |||||
Width="auto" | Width="auto" | ||||
Height="20" | |||||
MinWidth="0" | MinWidth="0" | ||||
MinHeight="0" | MinHeight="0" | ||||
Margin="1" | Margin="1" | ||||
Padding="{TemplateBinding Padding}" | Padding="{TemplateBinding Padding}" | ||||
Background="Transparent" | |||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" | ||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" | ||||
Background="Transparent" | |||||
Content="{TemplateBinding Header}" | Content="{TemplateBinding Header}" | ||||
ContentTemplate="{TemplateBinding HeaderTemplate}" | ContentTemplate="{TemplateBinding HeaderTemplate}" | ||||
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" | ||||
@@ -450,16 +452,16 @@ | |||||
<Grid Grid.Row="0"> | <Grid Grid.Row="0"> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition></RowDefinition> | |||||
<RowDefinition></RowDefinition> | |||||
<RowDefinition></RowDefinition> | |||||
<RowDefinition /> | |||||
<RowDefinition /> | |||||
<RowDefinition /> | |||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition Width="3*"></ColumnDefinition> | |||||
<ColumnDefinition Width="7*"></ColumnDefinition> | |||||
<ColumnDefinition Width="3*" /> | |||||
<ColumnDefinition Width="7*" /> | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<TextBlock | |||||
<TextBlock | |||||
Grid.Row="0" | Grid.Row="0" | ||||
Grid.Column="0" | Grid.Column="0" | ||||
Margin="7,5,0,0" | Margin="7,5,0,0" | ||||
@@ -467,7 +469,7 @@ | |||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
FontSize="16" | FontSize="16" | ||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="配方名称:"></TextBlock> | |||||
Text="配方名称:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="0" | Grid.Row="0" | ||||
Grid.Column="1" | Grid.Column="1" | ||||
@@ -477,7 +479,7 @@ | |||||
FontSize="16" | FontSize="16" | ||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="{Binding RecipeName}" /> | Text="{Binding RecipeName}" /> | ||||
<TextBlock | |||||
<TextBlock | |||||
Grid.Row="1" | Grid.Row="1" | ||||
Grid.Column="0" | Grid.Column="0" | ||||
Margin="7,5,0,0" | Margin="7,5,0,0" | ||||
@@ -485,7 +487,7 @@ | |||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
FontSize="16" | FontSize="16" | ||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="配方编号:"></TextBlock> | |||||
Text="配方编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | Grid.Row="1" | ||||
Grid.Column="1" | Grid.Column="1" | ||||
@@ -495,7 +497,7 @@ | |||||
FontSize="16" | FontSize="16" | ||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="{Binding RecipeCode}" /> | Text="{Binding RecipeCode}" /> | ||||
<TextBlock | |||||
<TextBlock | |||||
Grid.Row="2" | Grid.Row="2" | ||||
Grid.Column="0" | Grid.Column="0" | ||||
Margin="7,5,0,0" | Margin="7,5,0,0" | ||||
@@ -503,7 +505,7 @@ | |||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
FontSize="16" | FontSize="16" | ||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="托盘编号:"></TextBlock> | |||||
Text="托盘编号:" /> | |||||
<TextBlock | <TextBlock | ||||
Grid.Row="2" | Grid.Row="2" | ||||
Grid.Column="1" | Grid.Column="1" | ||||
@@ -514,53 +516,62 @@ | |||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="{Binding TrayCode}" /> | Text="{Binding TrayCode}" /> | ||||
</Grid> | </Grid> | ||||
<TextBlock | <TextBlock | ||||
Grid.Row="1" | Grid.Row="1" | ||||
FontSize="16" | |||||
Margin="7,2,0,0" | Margin="7,2,0,0" | ||||
VerticalAlignment="Top" | VerticalAlignment="Top" | ||||
FontSize="16" | |||||
Foreground="#FF2AB2E7" | Foreground="#FF2AB2E7" | ||||
Text="原料信息:" /> | Text="原料信息:" /> | ||||
<ScrollViewer | <ScrollViewer | ||||
Grid.Row="2" | |||||
VerticalAlignment="Top" | |||||
Background="Transparent" | |||||
HorizontalScrollBarVisibility="Hidden" | |||||
VerticalScrollBarVisibility="Visible"> | |||||
Grid.Row="2" | |||||
VerticalAlignment="Top" | |||||
Background="Transparent" | |||||
HorizontalScrollBarVisibility="Hidden" | |||||
VerticalScrollBarVisibility="Visible"> | |||||
<ItemsControl ItemsSource="{Binding RawMaterial}"> | <ItemsControl ItemsSource="{Binding RawMaterial}"> | ||||
<ItemsControl.ItemsPanel> | <ItemsControl.ItemsPanel> | ||||
<ItemsPanelTemplate> | <ItemsPanelTemplate> | ||||
<StackPanel/> | |||||
<StackPanel /> | |||||
</ItemsPanelTemplate> | </ItemsPanelTemplate> | ||||
</ItemsControl.ItemsPanel> | </ItemsControl.ItemsPanel> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Expander Style="{StaticResource ExpanderStyle}" Margin="40,0,0,0"> | |||||
<Expander Margin="40,0,0,0" Style="{StaticResource ExpanderStyle}"> | |||||
<Expander.Header> | <Expander.Header> | ||||
<StackPanel Orientation="Horizontal"> | <StackPanel Orientation="Horizontal"> | ||||
<Border Width="15" Height="15" CornerRadius="15" HorizontalAlignment="Left" Margin="0,0,5,0"> | |||||
<Border | |||||
Width="15" | |||||
Height="15" | |||||
Margin="0,0,5,0" | |||||
HorizontalAlignment="Left" | |||||
CornerRadius="15"> | |||||
<Border.Background> | <Border.Background> | ||||
<RadialGradientBrush> | <RadialGradientBrush> | ||||
<GradientStop Color="#FF2AB2E7" Offset="0.5" /> | |||||
<GradientStop Color="White"/> | |||||
<GradientStop Offset="0.5" Color="#FF2AB2E7" /> | |||||
<GradientStop Color="White" /> | |||||
</RadialGradientBrush> | </RadialGradientBrush> | ||||
</Border.Background> | </Border.Background> | ||||
</Border> | </Border> | ||||
<TextBlock Text="{Binding RawMaterialName }" Foreground="#FF2AB2E7" VerticalAlignment="Center" FontSize="14"/> | |||||
<TextBlock | |||||
VerticalAlignment="Center" | |||||
FontSize="14" | |||||
Foreground="#FF2AB2E7" | |||||
Text="{Binding RawMaterialName}" /> | |||||
</StackPanel> | </StackPanel> | ||||
</Expander.Header> | </Expander.Header> | ||||
<Expander.Content> | <Expander.Content> | ||||
<StackPanel Margin="36,0,0,0"> | <StackPanel Margin="36,0,0,0"> | ||||
<StackPanel Orientation="Horizontal"> | <StackPanel Orientation="Horizontal"> | ||||
<TextBlock Text="原料桶号:" Foreground="#FF2AB2E7"/> | |||||
<TextBlock Text="{Binding RawMaterialBarrelNum}" Foreground="#FF2AB2E7"/> | |||||
<TextBlock Foreground="#FF2AB2E7" Text="原料桶号:" /> | |||||
<TextBlock Foreground="#FF2AB2E7" Text="{Binding RawMaterialBarrelNum}" /> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Orientation="Horizontal"> | <StackPanel Orientation="Horizontal"> | ||||
<TextBlock Text="原料重量:" Foreground="#FF2AB2E7"/> | |||||
<TextBlock Text="{Binding RawMaterialWeight}" Foreground="#FF2AB2E7"/> | |||||
<TextBlock Foreground="#FF2AB2E7" Text="原料重量:" /> | |||||
<TextBlock Foreground="#FF2AB2E7" Text="{Binding RawMaterialWeight}" /> | |||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</Expander.Content> | </Expander.Content> | ||||
@@ -1,16 +1,18 @@ | |||||
<UserControl x:Class="BPASmartClient.JXJFoodBigStation.View.StockBinRawMaterialView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
mc:Ignorable="d" | |||||
d:DesignHeight="1080" d:DesignWidth="1920"> | |||||
<UserControl | |||||
x:Class="BPASmartClient.JXJFoodBigStation.View.StockBinRawMaterialView" | |||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | |||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | |||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | |||||
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" | |||||
xmlns:vm="clr-namespace:BPASmartClient.JXJFoodBigStation.ViewModel" | |||||
d:DesignHeight="1080" | |||||
d:DesignWidth="1920" | |||||
mc:Ignorable="d"> | |||||
<UserControl.DataContext> | <UserControl.DataContext> | ||||
<vm:StockBinRawMaterialViewModel /> | <vm:StockBinRawMaterialViewModel /> | ||||
</UserControl.DataContext> | </UserControl.DataContext> | ||||
<Grid Margin="10"> | <Grid Margin="10"> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<!--<RowDefinition Height="60" />--> | <!--<RowDefinition Height="60" />--> | ||||
@@ -35,29 +37,52 @@ | |||||
Foreground="Aqua" | Foreground="Aqua" | ||||
Style="{StaticResource IcoButtonStyle}" /> | Style="{StaticResource IcoButtonStyle}" /> | ||||
</StackPanel> | </StackPanel> | ||||
</Grid>--> | </Grid>--> | ||||
<Grid | <Grid | ||||
Grid.Row="0" | Grid.Row="0" | ||||
Margin="0,10,0,0" | Margin="0,10,0,0" | ||||
Background="#ff0C255F"> | Background="#ff0C255F"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition Width="1*"/> | |||||
<ColumnDefinition Width="1*"/> | |||||
<ColumnDefinition Width="1*"/> | |||||
<ColumnDefinition Width="1*"/> | |||||
<ColumnDefinition Width="1*" /> | |||||
<ColumnDefinition Width="1*" /> | |||||
<ColumnDefinition Width="1*" /> | |||||
<ColumnDefinition Width="1*" /> | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Grid Grid.Column="0"> | <Grid Grid.Column="0"> | ||||
<TextBlock Text="序号" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua"/> | |||||
<Border BorderThickness="1,1,1,1" Cursor="SizeWE" /> | |||||
<TextBlock | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="24" | |||||
Foreground="Aqua" | |||||
Text="序号" /> | |||||
<Border BorderThickness="1,1,1,1" Cursor="SizeWE" /> | |||||
</Grid> | </Grid> | ||||
<TextBlock Grid.Column="1" FontSize="24" Text="料仓位置" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" /> | |||||
<TextBlock Grid.Column="2" FontSize="24" Text="原料编号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" /> | |||||
<TextBlock Grid.Column="3" FontSize="24" Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Aqua" /> | |||||
<TextBlock | |||||
Grid.Column="1" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="24" | |||||
Foreground="Aqua" | |||||
Text="料仓位置" /> | |||||
<TextBlock | |||||
Grid.Column="2" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="24" | |||||
Foreground="Aqua" | |||||
Text="原料编号" /> | |||||
<TextBlock | |||||
Grid.Column="3" | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="24" | |||||
Foreground="Aqua" | |||||
Text="原料名称" /> | |||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="1"> | <Grid Grid.Row="1"> | ||||
<ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" > | |||||
<ItemsControl ItemsSource="{Binding RawMaterialInfo}" Foreground="Aqua"> | |||||
<ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | |||||
<ItemsControl Foreground="Aqua" ItemsSource="{Binding RawMaterialInfo}"> | |||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Grid Name="gr" Margin="5"> | <Grid Name="gr" Margin="5"> | ||||
@@ -69,46 +94,38 @@ | |||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Grid Grid.Column="0" Margin="5"> | <Grid Grid.Column="0" Margin="5"> | ||||
<TextBlock | <TextBlock | ||||
FontSize="16" | |||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
Text="{Binding RawMaterialCount}" /> | |||||
<Border | |||||
BorderThickness="1,0,1,0" | |||||
Cursor="SizeWE" /> | |||||
FontSize="16" | |||||
Text="{Binding RawMaterialCount}" /> | |||||
<Border BorderThickness="1,0,1,0" Cursor="SizeWE" /> | |||||
</Grid> | </Grid> | ||||
<Grid Grid.Column="1" Margin="5"> | <Grid Grid.Column="1" Margin="5"> | ||||
<TextBlock | <TextBlock | ||||
FontSize="16" | |||||
TextAlignment="Center" | |||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
Text="{Binding RawMaterialLocation}" /> | |||||
<Border | |||||
BorderThickness="1,0,1,0" | |||||
Cursor="SizeWE" /> | |||||
FontSize="16" | |||||
Text="{Binding RawMaterialLocation}" | |||||
TextAlignment="Center" /> | |||||
<Border BorderThickness="1,0,1,0" Cursor="SizeWE" /> | |||||
</Grid> | </Grid> | ||||
<Grid Grid.Column="2" Margin="5"> | <Grid Grid.Column="2" Margin="5"> | ||||
<TextBlock | <TextBlock | ||||
FontSize="16" | |||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
VerticalAlignment="Center" | |||||
Text="{Binding RawMaterialName}" /> | |||||
<Border | |||||
BorderThickness="1,0,1,0" | |||||
Cursor="SizeWE" /> | |||||
VerticalAlignment="Center" | |||||
FontSize="16" | |||||
Text="{Binding RawMaterialName}" /> | |||||
<Border BorderThickness="1,0,1,0" Cursor="SizeWE" /> | |||||
</Grid> | </Grid> | ||||
<Grid Grid.Column="3"> | <Grid Grid.Column="3"> | ||||
<TextBlock | <TextBlock | ||||
FontSize="16" | |||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
VerticalAlignment="Center" | |||||
Text="{Binding RawMaterialChineseName}" /> | |||||
<Border | |||||
BorderThickness="1,0,1,0" | |||||
Cursor="SizeWE" /> | |||||
VerticalAlignment="Center" | |||||
FontSize="16" | |||||
Text="{Binding RawMaterialChineseName}" /> | |||||
<Border BorderThickness="1,0,1,0" Cursor="SizeWE" /> | |||||
<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> | <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> | ||||
<pry:IcoButton | <pry:IcoButton | ||||
Margin="3,4,4,0" | Margin="3,4,4,0" | ||||
@@ -124,10 +141,10 @@ | |||||
IcoText="" | IcoText="" | ||||
Style="{StaticResource IcoButtonStyle}" /> | Style="{StaticResource IcoButtonStyle}" /> | ||||
</StackPanel>--> | </StackPanel>--> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
<DataTemplate.Triggers> | <DataTemplate.Triggers> | ||||
<Trigger Property="IsMouseOver" Value="true"> | <Trigger Property="IsMouseOver" Value="true"> | ||||
<Setter TargetName="gr" Property="Background" Value="#112AB2E7" /> | <Setter TargetName="gr" Property="Background" Value="#112AB2E7" /> | ||||
@@ -246,7 +246,7 @@ | |||||
Background="#ff0C255F"> | Background="#ff0C255F"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
@@ -315,7 +315,7 @@ | |||||
<DataTemplate> | <DataTemplate> | ||||
<Grid Name="gr"> | <Grid Name="gr"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition /> | |||||
<ColumnDefinition /> | |||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
<ColumnDefinition Width="0.4*" /> | <ColumnDefinition Width="0.4*" /> | ||||
@@ -780,8 +780,8 @@ | |||||
</TreeView>--> | </TreeView>--> | ||||
<!-- 等待和已完成 --> | <!-- 等待和已完成 --> | ||||
<TreeView | |||||
<TreeView | |||||
x:Name="repiceList" | x:Name="repiceList" | ||||
HorizontalAlignment="Stretch" | HorizontalAlignment="Stretch" | ||||
Background="Transparent" | Background="Transparent" | ||||
@@ -790,8 +790,8 @@ | |||||
ItemsSource="{Binding UserTreeWait}" | ItemsSource="{Binding UserTreeWait}" | ||||
ScrollViewer.VerticalScrollBarVisibility="Visible" /> | ScrollViewer.VerticalScrollBarVisibility="Visible" /> | ||||
</Grid> | </Grid> | ||||
</Border> | </Border> | ||||