1. 修复 上料 AClear,BClear 只能按一次

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/Page_Main.xaml

@@ -144,16 +144,18 @@
 
                             <TextBlock Text="内收卷" Grid.Column="1" FontSize="35" Margin="3,0" Padding="4,0" Background="#FF636363" Foreground="White"/>
                             <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="auto"/>
+                                </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal" >
                                     <TextBlock Text="当前" Style="{StaticResource TextBlockStyle_title}" FontSize="{StaticResource FontSize_title}" Margin="3,0"/>
-
                                     <TextBlock >
                                             <Run Text="{Binding Accessory.ACurrent,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_context_max}" />
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
                                     </TextBlock>
-
                                 </StackPanel>
-                                <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-5,0,0" Click="button_aclear_Click">
+                                <Button Grid.Column="1" Style="{StaticResource ButtonStyle_empty}" Background="Transparent" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-5,0,0" Click="button_aclear_Click">
                                     <Grid Style="{StaticResource GridStyle_ButtonShadow}">
                                         <Grid Width="50" Height="50">
                                             <Ellipse Fill="White" Stretch="Uniform"/>
@@ -197,6 +199,10 @@
 
                             <TextBlock Text="外收卷" Grid.Column="1" FontSize="35" Margin="3,0" Padding="4,0" Background="#FF636363" Foreground="White"/>
                             <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="auto"/>
+                                </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal" >
                                     <TextBlock Text="当前" Style="{StaticResource TextBlockStyle_title}" FontSize="{StaticResource FontSize_title}" Margin="3,0"/>
 
@@ -206,7 +212,7 @@
                                     </TextBlock>
 
                                 </StackPanel>
-                                <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-5,0,0" Click="button_bclear_Click">
+                                <Button Grid.Column="1" Style="{StaticResource ButtonStyle_empty}" Background="Transparent" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-5,0,0" Click="button_bclear_Click">
                                     <Grid Style="{StaticResource GridStyle_ButtonShadow}">
                                         <Grid Width="50" Height="50">
                                             <Ellipse Fill="White" Stretch="Uniform"/>

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/Page_Main.xaml.cs

@@ -67,9 +67,12 @@ namespace FLY.Weight.UI.Client.UIModule
                                 "ALast",
                                 "ACurrent",
                                 "ACurrentLen",
+                                "AClear",
                                 "BLast",
                                 "BCurrent",
                                 "BCurrentLen",
+                                "BClear",
+
                                 "TotalFilmWidth",
                                 "IsRimNoRecycle",
                                 "RimWidth",