1.修改名称

2.efem隐藏barcode

RecipeEditorControl/View/EndPointDlg.xaml

@@ -65,16 +65,16 @@
                 <ColumnDefinition Width="120"/>
             </Grid.ColumnDefinitions>
             <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="1">
-                <TextBlock Grid.Row="1" Text="A" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
+                <TextBlock Grid.Row="1" Text="R1" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="2">
-                <TextBlock Grid.Row="2" Text="B" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
+                <TextBlock Grid.Row="2" Text="R2" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="3">
-                <TextBlock Grid.Row="3" Text="C" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
+                <TextBlock Grid.Row="3" Text="R3" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="4">
-                <TextBlock Grid.Row="4" Text="D" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
+                <TextBlock Grid.Row="4" Text="R4" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
             </Border>
  
 

VirgoUI/Controls/Parts/Efem.xaml

@@ -153,11 +153,11 @@
                 <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
-            <Rectangle Grid.Row="0" Grid.Column="0" Fill="#376092" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
+            <!--<Rectangle Grid.Row="0" Grid.Column="0" Fill="#376092" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
             <TextBlock Grid.Row="0" Grid.Column="0" FontSize="13" Margin="3,0,0,0"  VerticalAlignment="Center"   Text="Carrier ID:"  Foreground="White" />
 
             <Rectangle Grid.Row="0" Grid.Column="1" Fill="#95B3D7" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
-            <deviceControl:AITBarcodeTextBox Grid.Row="0" Grid.Column="1" FontSize="12"   Foreground="White"  BarcodeText="{Binding LP1CarrierIDText, Mode=TwoWay}"  BarcodeInputChangedCommand="{Binding LP1CarrierIDChangedCommand}" MaxScanCount="1" />
+            <deviceControl:AITBarcodeTextBox Grid.Row="0" Grid.Column="1" FontSize="12"   Foreground="White"  BarcodeText="{Binding LP1CarrierIDText, Mode=TwoWay}"  BarcodeInputChangedCommand="{Binding LP1CarrierIDChangedCommand}" MaxScanCount="1" />-->
 
         </Grid>
 
@@ -169,11 +169,11 @@
                 <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
-            <Rectangle Grid.Row="0" Grid.Column="0" Fill="#376092" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
+            <!--<Rectangle Grid.Row="0" Grid.Column="0" Fill="#376092" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
             <TextBlock Grid.Row="0" Grid.Column="0" FontSize="13" Margin="3,0,0,0" VerticalAlignment="Center"   Text="Carrier ID:"  Foreground="White" />
 
             <Rectangle Grid.Row="0" Grid.Column="1" Fill="#95B3D7" Margin="0" Stroke="White" StrokeThickness="1"></Rectangle>
-            <deviceControl:AITBarcodeTextBox Grid.Row="0" Grid.Column="1" FontSize="12"   Foreground="White"  BarcodeText="{Binding LP2CarrierIDText, Mode=TwoWay}"  BarcodeInputChangedCommand="{Binding LP2CarrierIDChangedCommand}" MaxScanCount="1" />
+            <deviceControl:AITBarcodeTextBox Grid.Row="0" Grid.Column="1" FontSize="12"   Foreground="White"  BarcodeText="{Binding LP2CarrierIDText, Mode=TwoWay}"  BarcodeInputChangedCommand="{Binding LP2CarrierIDChangedCommand}" MaxScanCount="1" />-->
 
         </Grid>