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

MainWindow.xaml

@@ -42,8 +42,8 @@
                 <MenuItem Header="_客户" FontSize="16" Name="_client" Click="client" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_查询" FontSize="16" Focusable ="False">
-                <MenuItem Header="_料单查询" FontSize="16"/>
-                <MenuItem Header="_历史查询" FontSize="16"/>
+                <MenuItem Header="_领料单据" FontSize="16"/>
+                <MenuItem Header="_转换历史" FontSize="16"/>
                 <MenuItem Header="_统计" FontSize="16" Name="_statistics" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_帮助" FontSize="16" Focusable ="False">
@@ -69,7 +69,7 @@
         <TextBox x:Name="Number" HorizontalAlignment="Left" ToolTip="当前配方的物料单" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
         <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <TextBox x:Name="ReDye" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 
-                 MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False" Grid.Column="1"/>
+                 MaxLines="1" MaxLength="2" Grid.Column="1" IsReadOnly="True"/>
         <TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <ComboBox x:Name="Machine" DisplayMemberPath="Name"
                   ItemsSource="{Binding mac_Machine, Source={StaticResource MainWindowViewModel}}" 
@@ -185,33 +185,22 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CellStyle="{StaticResource CellStyle}">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" 
-                                      BorderBrush="{x:Null}" Background="{x:Null}" 
-                                      IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False">
-                                <ComboBoxItem Content="%"></ComboBoxItem>
-                                <ComboBoxItem Content="g/L"></ComboBoxItem>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CellStyle="{StaticResource CellStyle}" Binding="{Binding SHIFT}"/>
                 <DataGridTemplateColumn Header="原料名称" Width="200" MaxWidth="400" MinWidth="100" CellStyle="{StaticResource CellStyle}">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox x:Name="CP_PRODUCT_NAME" BorderThickness="0,0,0,0"                                          
+                   <DataGridTemplateColumn.CellTemplate>
+                       <DataTemplate>
+                           <ComboBox x:Name="CP_PRODUCT_NAME" BorderThickness="0,0,0,0"                                          
                                       ItemsSource="{Binding stuff_Product, Source={StaticResource MainWindowViewModel}}"
                                       DisplayMemberPath="ProductName"
                                       Text="{Binding PRODUCT_NAME}"
                                       DropDownClosed="CP_PRODUCT_NAME_DropDownClosed"
                                       BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False"/>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
+                       </DataTemplate>
+                   </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
                 <DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
-                <DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="600" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="600" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}" IsReadOnly="False"/>
             </DataGrid.Columns>
         </DataGrid>