步骤页面变更

View/DyeingPlanView.xaml

@@ -6,8 +6,14 @@
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"    
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"          
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
+             xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels" 
              mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DesignHeight="900" d:DesignWidth="1100">
+    <UserControl.Resources>
+        <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
+        <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+    </UserControl.Resources>
     <Grid Background="White" Cursor="">
         <ComboBox HorizontalAlignment="Left" Height="30" Margin="140,30,10,0" x:Name="comboBoxWorkOrder" VerticalAlignment="Top" Width="270" 
            FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxWorkOrder_KeyDown"/>
@@ -69,7 +75,7 @@
            Margin="0,100,10,60" Width="600" HorizontalAlignment="Right" BorderBrush="#FFC9C9C9" FontSize="16" BorderThickness="5,5,5,5" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
-                    <Setter Property="Height" Value="25" />
+                    <Setter Property="Height" Value="100" />
                     <Setter Property="FontSize" Value="15" />
                     <Style.Triggers>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -106,20 +112,76 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="40" IsReadOnly="True" />
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}"    
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                                 Width="60" IsReadOnly="True">
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="150" Binding="{Binding StepName}" IsReadOnly="True"/>
+                    <DataGridTextColumn.ElementStyle>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"  
+                                 MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
-                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
+                    <DataGridTemplateColumn.CellTemplate>
-                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
+                        <DataTemplate>
-                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
+                            <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
-                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="300"  IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                    <TextBlock Height="50" >                         
+    <Run Text="{x:Static lang:Resources.Function}"/>        
+    <Run Text=":"/>                       
+    <Run Text="{Binding StepName}"/>
+                                    </TextBlock>
+                                </Border>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                    <TextBlock Height="50" >                         
+    <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+    <Run Text=":"/>                      
+    <Run Text="{Binding ParameterName}"/>
+                                    </TextBlock>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
 

View/ProductionPlanningEdit.xaml

@@ -6,8 +6,14 @@
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"    
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"          
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
+             xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels" 
              mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DesignHeight="900" d:DesignWidth="550">
+    <UserControl.Resources>
+        <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
+        <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+    </UserControl.Resources>
     <Grid Background="White" Cursor="">
         <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,30,0,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" 
                   FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxMachine_DropDownClosed" IsReadOnly="True" />
@@ -34,7 +40,7 @@
            Margin="0,200,0,60" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
-                    <Setter Property="Height" Value="25" />
+                    <Setter Property="Height" Value="100" />
                     <Setter Property="FontSize" Value="15" />
                     <Style.Triggers>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -64,20 +70,76 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="40" IsReadOnly="True" />
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}"    
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                                    Width="60" IsReadOnly="True">
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="200" Binding="{Binding StepName}" IsReadOnly="True"/>
+                    <DataGridTextColumn.ElementStyle>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+   MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"  
+                                    MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+   MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
-                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
+                    <DataGridTemplateColumn.CellTemplate>
-                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
+                        <DataTemplate>
-                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
+                            <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
-                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="300"  IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                    <TextBlock Height="50" >                         
+       <Run Text="{x:Static lang:Resources.Function}"/>        
+       <Run Text=":"/>                       
+       <Run Text="{Binding StepName}"/>
+                                    </TextBlock>
+                                </Border>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                    <TextBlock Height="50" >                         
+       <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+       <Run Text=":"/>                      
+       <Run Text="{Binding ParameterName}"/>
+                                    </TextBlock>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>