优化称重V3 恢复 “边料不回收” 按钮

d4a4d790 · 潘栩锋 · 2660dae9 · d4a4d790 · d4a4d790 · d4a4d790
Commit d4a4d790 authored Dec 04, 2022 by 潘栩锋 🚴
4 changed files
--- a/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
+++ b/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.2")]
-[assembly: AssemblyFileVersion("7.7.2")]
+[assembly: AssemblyVersion("7.7.2.1")]
+[assembly: AssemblyFileVersion("7.7.2.1")]
 [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
--- a/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
+++ b/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.2")]
-[assembly: AssemblyFileVersion("7.7.2")]
+[assembly: AssemblyVersion("7.7.2.1")]
+[assembly: AssemblyFileVersion("7.7.2.1")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
--- a/Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V3/UcThicknessV3.xaml
+++ b/Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V3/UcThicknessV3.xaml
@@ -24,6 +24,17 @@
                                    <Run Text="mm" Style="{StaticResource RunStyle_unit}" />
                        </TextBlock>
                    </StackPanel>
+                    <StackPanel Margin="3" >
+                        <TextBlock Text="边料不回收" Style="{StaticResource TextBlockStyle_title_activity}"/>
+                        <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Accessory.IsRimNoRecycle}" HorizontalAlignment="Left" IsEnabled="False"/>
+                    </StackPanel>
+                    <StackPanel Margin="3" >
+                        <TextBlock Text="切边" Style="{StaticResource TextBlockStyle_title_activity}"/>
+                        <TextBlock >
+                                <Run Text="{Binding Accessory.RimWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" />
+                                <Run Text="mm" Style="{StaticResource RunStyle_unit}" />
+                        </TextBlock>
+                    </StackPanel>
                    <StackPanel Margin="3" Background="{StaticResource Color_background2}" >
                        <TextBlock Text="收卷宽度" Style="{StaticResource TextBlockStyle_title}" />
                        <TextBlock >

--- a/Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V3/UcTotalFlowV3.xaml
+++ b/Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V3/UcTotalFlowV3.xaml
@@ -80,11 +80,13 @@
                                        <iconPacks:PackIconMaterial Kind="CloseBox" Width="40"/>
                                    </Grid>
                                </Button>
-
-                                <TextBlock Grid.Row="1" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.ColumnSpan="2" >
-                                <Run Text="{Binding Accessory.TotalProduction,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
-                                <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                                </TextBlock>
+                                <Viewbox Grid.Row="1" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.ColumnSpan="2" HorizontalAlignment="Left"
+                                    MaxWidth="150" Stretch="Uniform" StretchDirection="DownOnly">
+                                    <TextBlock >
+                                        <Run Text="{Binding Accessory.TotalProduction,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
+                                        <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
+                                    </TextBlock>
+                                </Viewbox>
                            </Grid>
                        </StackPanel>
                    </Viewbox>
@@ -126,7 +128,7 @@
                                </Grid.ColumnDefinitions>
                                <StackPanel Orientation="Horizontal" >
                                    <TextBlock Text="当前&#13;内收卷" Style="{StaticResource TextBlockStyle_title}" Margin="3,0" Padding="4,0" Background="#FF636363" Foreground="White"/>
-                                    <Viewbox MaxWidth="150" Stretch="Uniform" StretchDirection="DownOnly">
+                                    <Viewbox MaxWidth="100" Stretch="Uniform" StretchDirection="DownOnly">
                                        <TextBlock >
                                        <Run Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"
                                                Text="{Binding Accessory.ACurrent,StringFormat={}{0:F0}}" />
@@ -176,7 +178,7 @@
                                </Grid.ColumnDefinitions>
                                <StackPanel Orientation="Horizontal" >
                                    <TextBlock Text="当前&#13;外收卷" Style="{StaticResource TextBlockStyle_title}" Margin="3,0" Padding="4,0" Background="#FF636363" Foreground="White"/>
-                                    <Viewbox MaxWidth="150" Stretch="Uniform" StretchDirection="DownOnly">
+                                    <Viewbox MaxWidth="100" Stretch="Uniform" StretchDirection="DownOnly">
                                        <TextBlock >
                                        <Run Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}" 
                                                Text="{Binding Accessory.BCurrent,StringFormat={}{0:F0}}" />