临时提交

SCADA_DAQ/Customer/Views/Menu/UctFrmBackOfSortingDelivery/UctFrmSortingDelivery.xaml.cs

@@ -166,10 +166,7 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmBackOfSortingDelivery
 
         private void ClearNGQueue_Click(object sender, RoutedEventArgs e)
         {
-            if (MessageBox.Show("当前队列将会清空,是否继续?") == MessageBoxResult.OK)
-            {
-                _PLC.LeftLoversOrAbnormal.Clear();
-            }
+            _PLC.LeftLoversOrAbnormal.Clear();
         }
 
         private void _Sbr1_BarCodeReceived(object sender, SCADA.BarcodeReader.BarcodeReceivedEventArgs e)

SCADA_DAQ/Customer/Views/Uct/UctSortingDelivery/BoardInfoDashboard.xaml

@@ -10,40 +10,40 @@
                              x:Name="this"
              d:DesignHeight="450" d:DesignWidth="800">
 
-        <wpfcontrol:Card Header="{Binding Header,ElementName=this}"  CardStyle="Info" Margin="5" CornerRadius="10">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition Height="auto"/>
-                </Grid.RowDefinitions>
-                <dashboard:DashboardDataGrid x:Name="BoardGrid" Grid.Column="2" Margin="8,16" AutoGenerateColumns="False" >
-                    <dashboard:DashboardDataGrid.Columns>
+    <wpfcontrol:Card Header="{Binding Header,ElementName=this}"  CardStyle="Info" Margin="5" CornerRadius="10">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+            <dashboard:DashboardDataGrid x:Name="BoardGrid" Grid.Column="2" Margin="8,16" AutoGenerateColumns="False" >
+                <dashboard:DashboardDataGrid.Columns>
                     <DataGridTextColumn   Binding="{Binding Index}" Width="0.5*" Foreground="Black" FontSize="12">
                         <DataGridTextColumn.Header>
                             <TextBlock Text="序号" Foreground="Black" FontWeight="Bold"/>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
                     <DataGridTextColumn   Binding="{Binding Barcode}" Width="1.5*" Foreground="Black" FontSize="12">
-                            <DataGridTextColumn.Header>
-                                <TextBlock Text="条码" Foreground="Black" FontWeight="Bold"/>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding FinishTime,StringFormat=HH:mm:ss}" Width="1*" Foreground="Black" FontSize="12" >
-                            <DataGridTextColumn.Header>
-                                <TextBlock Text="时间" Foreground="Black" FontWeight="Bold"/>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <!--<DataGridTextColumn Binding="{Binding SequenceNo}" Width="1*" Foreground="Black" FontSize="12">
+                        <DataGridTextColumn.Header>
+                            <TextBlock Text="条码" Foreground="Black" FontWeight="Bold"/>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding FinishTime,StringFormat=HH:mm:ss}" Width="1*" Foreground="Black" FontSize="12" >
+                        <DataGridTextColumn.Header>
+                            <TextBlock Text="时间" Foreground="Black" FontWeight="Bold"/>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <!--<DataGridTextColumn Binding="{Binding SequenceNo}" Width="1*" Foreground="Black" FontSize="12">
                             <DataGridTextColumn.Header>
                                 <TextBlock Text="工件序号" Foreground="Black" FontWeight="Bold"/>
                             </DataGridTextColumn.Header>
                         </DataGridTextColumn>-->
-                    </dashboard:DashboardDataGrid.Columns>
-                </dashboard:DashboardDataGrid>
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                <wpfcontrol:IconButton ButtonKind="ClearButton"  Title="清除NG通道板件"  Grid.Row="1" HorizontalAlignment="Right" x:Name="ClearNGQueue"/>
-                <wpfcontrol:IconButton ButtonKind="ClearButton"  Title="清除所有板件"  Grid.Row="1" HorizontalAlignment="Right" Click="IconButton_Click"/>
+                </dashboard:DashboardDataGrid.Columns>
+            </dashboard:DashboardDataGrid>
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Bottom" Grid.Row="1">
+                <wpfcontrol:IconButton ButtonKind="ClearButton"  Title="清除NG通道板件"   HorizontalAlignment="Right" x:Name="ClearNGQueue" Margin="0,0,10,0"/>
+                <wpfcontrol:IconButton ButtonKind="ClearButton"  Title="清除已发送条码"   HorizontalAlignment="Right" Click="IconButton_Click"/>
             </StackPanel>
         </Grid>
-        </wpfcontrol:Card>
+    </wpfcontrol:Card>
 </wpfcontrol:BaseUserControl>

SCADA_DAQ/Customer/Views/Uct/UctSortingDelivery/BoardInfoDashboard.xaml.cs

@@ -51,13 +51,11 @@ namespace SCADA_DAQ.Customer.Views.Uct.UctSortingDelivery
         private void IconButton_Click(object sender, RoutedEventArgs e)
         {
                  
-            if (MessageBox.Show("当前队列将会清空,是否继续?") == MessageBoxResult.OK)
-            {
                 if (BoardGrid.ItemsSource is ObservableCollection<CodeInfoModel> items)
                 {
                     items.Clear();
                 }
-            }
+            
         }
 
     }