1. 优化 3个月才会提示需要数据归档

2. 修复 称重数位多，导致某些层比其它层显示短
3. 修复 吸料没显示状态
4. 修复 I层 设置比例与当前比例 地址错误

Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360/Server/BlowingDetect360.cs

@@ -79,6 +79,12 @@ namespace FLY.Thick.Blowing360.Server
         [Obsolete("360连续旋转 此接口无效")]
         public bool Is3D { get; set; }
 
+        [Obsolete("360连续旋转 此接口无效")]
+        public bool IsPlcMode { get; set; }
+
+        [Obsolete("360连续旋转 此接口无效")]
+        public string PlcAddr { get; set; }
+
         /// <summary>
         /// 使用编码器检测旋转架旋转位置模式
         /// </summary>
@@ -196,6 +202,7 @@ namespace FLY.Thick.Blowing360.Server
         /// 旋转架脉冲速度,  旋转架角速度 = RSpeed * RAngle / RPosOfR
         /// </summary>
         public int RSpeed { get; protected set; }
+
         #endregion
 
 

Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360/Server/GM_BlowingFix360.cs

@@ -112,6 +112,7 @@ namespace FLY.Thick.Blowing360.Server
         /// 测厚仪测量点位置方向：Left， Right （也就是三角形在左还是右）
         /// </summary>
         public bool IsProbeRight { get; set; } = true;
+        public bool IsForwCW { get; set; } = false;
 
 
         /// <summary>

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.6.2.0")]
-[assembly: AssemblyFileVersion("7.6.2.0")]
+[assembly: AssemblyVersion("7.6.3.1")]
+[assembly: AssemblyFileVersion("7.6.3.1")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.6.1.0")]
-[assembly: AssemblyFileVersion("7.6.1.0")]
+[assembly: AssemblyVersion("7.6.2.0")]
+[assembly: AssemblyFileVersion("7.6.2.0")]
 [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
 

Project.FLY.Unions/FLY.Unions.UI/UcWeightProfile.xaml

@@ -80,7 +80,7 @@
                                                             Margin="0,0,0,5">
                                             <!--<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />-->
                                             <StackPanel Orientation="Horizontal">
-                                                <TextBlock x:Name="Tb" Text="{Binding .}" Foreground="{StaticResource Brushes.Static}" FontWeight="Bold" FontSize="26" FontFamily="Microsoft Sans Serif" />
+                                                <TextBlock x:Name="Tb" Text="{Binding .}" Foreground="{StaticResource Brushes.Static}" FontWeight="Bold" FontSize="26" FontFamily="{StaticResource FontFamily.Field}" />
                                             </StackPanel>
                                         </Border>
                                         <ControlTemplate.Triggers>

Project.FLY.Weight/FLY.Weight.UI.Client/Themes/UcWeighterItemStyle.xaml

@@ -33,4 +33,19 @@
         <Setter Property="CornerRadius" Value="5"/>
         <Setter Property="Background" Value="{StaticResource Color_background}"/>
     </Style>
+
+    <Style TargetType="Viewbox" x:Key="ViewbloxStyle_itemValue">
+        <Setter Property="Stretch" Value="Uniform"/>
+        <Setter Property="StretchDirection" Value="DownOnly"/>
+        <Setter Property="Width" Value="66"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+
+    <Style TargetType="Viewbox" x:Key="ViewbloxStyle_itemValue_XXXXXX" BasedOn="{StaticResource ViewbloxStyle_itemValue}">
+        <Setter Property="Width" Value="99"/>
+    </Style>
+    <Style TargetType="Viewbox" x:Key="ViewbloxStyle_itemValue_XXX" BasedOn="{StaticResource ViewbloxStyle_itemValue}">
+        <Setter Property="Width" Value="76"/>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/UcFeeder2.xaml.cs

@@ -29,7 +29,8 @@ namespace FLY.Weight.UI.Client.UiModule
             string[] propertynames = new string[] {
                 nameof(FeederData.IsFeederOn1),
                 nameof(FeederData.IsFeederResetValid1),
-                nameof(FeederData.FeederReset1)
+                nameof(FeederData.FeederReset1),
+                nameof(FeederData.FeederStatus1)
             };
 
             List<string> update_propertynames = new List<string>();

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V0/UcWeighterItemV0.xaml

@@ -15,7 +15,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}">
-        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[1]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
+        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[2]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
             <StackPanel >
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -67,19 +67,24 @@
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title_activity}" 
                                                Text="设置比例" />
-                                    <TextBlock >
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock >
                                                     <Run Style="{StaticResource RunStyle_text_activity}" 
                                                          Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" />
                                                     <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                        </TextBlock>
+                                    </Viewbox>
+                                    
                                 </StackPanel>
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title}" 
                                                Text="当前比例" />
-                                    <TextBlock>
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                        </TextBlock>
+                                    </Viewbox>
                                 </StackPanel>
                             </StackPanel>
                         </Grid>
@@ -100,10 +105,12 @@
 
                     <StackPanel Margin="3" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                         <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
-                        <TextBlock >
+                        <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
+                            <TextBlock >
                                             <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}"/>
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
+                            </TextBlock>
+                        </Viewbox>
                     </StackPanel>
                     <Grid Grid.Column="1">
                         <StackPanel Margin="3"  VerticalAlignment="Center" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
@@ -118,7 +125,7 @@
                     </Grid>
                     <StackPanel Margin="3" Grid.Row="1" >
                         <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                        <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                        <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                             <TextBlock >
                                 <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                                 <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
@@ -142,7 +149,7 @@
                                                 >
                             <StackPanel Margin="3" >
                                 <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock>
                                         <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                                         <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V0/UcWeighterItemV0_2.xaml

@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}">
-        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[2]}" HorizontalAlignment="Center" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
+        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[3]}" HorizontalAlignment="Center" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
             <StackPanel >
                 <Button Margin="2" Style="{StaticResource Styles.Button.Empty}" Background="{Binding Color}" 
                                             Click="button_ingredient_Click"
@@ -60,46 +60,38 @@
                         </Rectangle.Width>
                     </Rectangle>
                 </Border>
-                <Button Grid.Row="1" Grid.Column="1" Margin="3" Style="{StaticResource Styles.Button.Empty}" Click="button_ratio_Click" Tag="{Binding .}">
+                <Button Margin="3" Style="{StaticResource Styles.Button.Empty}" Click="button_ratio_Click" Tag="{Binding .}">
                     <StackPanel>
                         <StackPanel Margin="3">
                             <TextBlock Text="当前比例" Style="{StaticResource TextBlockStyle_title}"/>
-                            <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
-                                <TextBlock>
+                            <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                </TextBlock>
-                            </Viewbox>
+                            </TextBlock>
                         </StackPanel>
                         <StackPanel  Margin="3" >
                             <TextBlock Text="设置比例" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                            <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
-                                <TextBlock >
+                            <TextBlock >
                                         <Run Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}"/>
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                </TextBlock>
-                            </Viewbox>
+                            </TextBlock>
                         </StackPanel>
                     </StackPanel>
                 </Button>
                 <StackPanel Margin="3" 
                             Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                     <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
-                    <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                        <TextBlock >
+                    <TextBlock >
                                         <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
-                    </Viewbox>
+                    </TextBlock>
                 </StackPanel>
                 <StackPanel Margin="3" >
                     <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                    <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                        <TextBlock >
+                    <TextBlock >
                         <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                         <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
-                    </Viewbox>
+                    </TextBlock>
                 </StackPanel>
 
                 <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
@@ -129,12 +121,10 @@
                                                 >
                     <StackPanel Margin="3" >
                         <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                        <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                            <TextBlock >
+                        <TextBlock >
                             <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                             <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />
-                            </TextBlock>
-                        </Viewbox>
+                        </TextBlock>
                     </StackPanel>
                 </Button>
                 <StackPanel Margin="3">

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcWeighterItemV5.xaml

@@ -15,7 +15,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}">
-        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[2]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
+        <Viewbox Margin="{StaticResource ControlMargin}" d:DataContext="{Binding Items[3]}" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" StretchDirection="DownOnly">
             <StackPanel >
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -66,19 +66,24 @@
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title_activity}" 
                                                Text="设置比例" />
-                                    <TextBlock >
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock >
                                                     <Run Style="{StaticResource RunStyle_text_activity}" 
                                                          Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" />
                                                     <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                        </TextBlock>
+                                    </Viewbox>
+                                    
                                 </StackPanel>
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title}" 
                                                Text="当前比例" />
-                                    <TextBlock>
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                        </TextBlock>
+                                    </Viewbox>
                                 </StackPanel>
                             </StackPanel>
                         </Grid>
@@ -99,16 +104,19 @@
                     <Grid>
                         <StackPanel Margin="3" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                             <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
-                            <TextBlock >
+                            <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
+                                <TextBlock >
                                             <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}"/>
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                            </TextBlock>
+                                </TextBlock>
+                            </Viewbox>
+                            
                         </StackPanel>
                         <Button Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}"
                             Style="{StaticResource Styles.Button.Empty}" Click="button_density_Click" Tag="{Binding .}">
                             <StackPanel Margin="3" >
                                 <TextBlock Text="厚度" Style="{StaticResource TextBlockStyle_title}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock>
                                         <Run Text="{Binding Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="um" Style="{StaticResource RunStyle_unit}" />
@@ -131,7 +139,7 @@
                             Style="{StaticResource Styles.Button.Empty}" Click="button_density_Click" Tag="{Binding .}">
                             <StackPanel Margin="3" >
                                 <TextBlock Text="密度" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock >
                                         <Run Text="{Binding Density,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text_activity}" />
                                         <Run Text="kg/m³" Style="{StaticResource RunStyle_unit}" />
@@ -144,7 +152,7 @@
 
                     <StackPanel Margin="3" Grid.Row="1" >
                         <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                        <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                        <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                             <TextBlock >
                                 <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                                 <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
@@ -168,7 +176,7 @@
                                                 >
                             <StackPanel Margin="3" >
                                 <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock>
                                         <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                                         <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcWeighterItemV5_2.xaml

@@ -64,21 +64,17 @@
                     <StackPanel>
                         <StackPanel Margin="3">
                             <TextBlock Text="当前比例" Style="{StaticResource TextBlockStyle_title}"/>
-                            <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
-                                <TextBlock>
+                            <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                </TextBlock>
-                            </Viewbox>
+                            </TextBlock>
                         </StackPanel>
                         <StackPanel  Margin="3" >
                             <TextBlock Text="设置比例" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                            <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
-                                <TextBlock >
+                            <TextBlock >
                                         <Run Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}"/>
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                </TextBlock>
-                            </Viewbox>
+                            </TextBlock>
                         </StackPanel>
                     </StackPanel>
                 </Button>
@@ -94,12 +90,10 @@
                 </StackPanel>
                 <StackPanel Margin="3" >
                     <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                    <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                        <TextBlock >
+                    <TextBlock >
                         <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                         <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
-                    </Viewbox>
+                    </TextBlock>
                 </StackPanel>
                 <Grid>
                     <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
@@ -154,12 +148,10 @@
                                                 >
                     <StackPanel Margin="3" >
                         <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                        <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                            <TextBlock >
+                        <TextBlock >
                             <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                             <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />
-                            </TextBlock>
-                        </Viewbox>
+                        </TextBlock>
                     </StackPanel>
                 </Button>
                 <StackPanel Margin="3">

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V6/UcWeighterItemV6.xaml

@@ -76,19 +76,23 @@
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title_activity}" 
                                                Text="设置比例" />
-                                    <TextBlock >
-                                                    <Run Style="{StaticResource RunStyle_text_activity}" 
-                                                         Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" />
-                                                    <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock >
+                                                        <Run Style="{StaticResource RunStyle_text_activity}" 
+                                                             Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" />
+                                                        <Run Text="%" Style="{StaticResource RunStyle_unit}" />
+                                        </TextBlock>
+                                    </Viewbox>
                                 </StackPanel>
                                 <StackPanel>
                                     <TextBlock Style="{StaticResource TextBlockStyle_title}" 
                                                Text="当前比例" />
-                                    <TextBlock>
+                                    <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
+                                        <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
-                                    </TextBlock>
+                                        </TextBlock>
+                                    </Viewbox>
                                 </StackPanel>
                             </StackPanel>
                         </Grid>
@@ -97,16 +101,17 @@
                     <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Bottom">
                         <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                             <TextBlock Text="层厚度" Style="{StaticResource TextBlockStyle_title}"/>
-                            <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="80">
+                            <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                 <TextBlock>
                                         <Run Text="{Binding Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
+                                        <!--<Run Text="12.2" Style="{StaticResource RunStyle_text}" />-->
                                         <Run Text="um" Style="{StaticResource RunStyle_unit}" />
                                 </TextBlock>
                             </Viewbox>
                         </StackPanel>
                         <StackPanel  Grid.Column="1" >
                             <TextBlock Text="厚度比" Style="{StaticResource TextBlockStyle_title}"/>
-                            <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="80">
+                            <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                 <TextBlock >
                                         <Run Text="{Binding ThicknessPercent,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}"/>
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
@@ -129,16 +134,20 @@
                     <Grid>
                         <StackPanel Margin="3" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                             <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
-                            <TextBlock >
-                                            <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}"/>
+                            <Viewbox  Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
+                                <TextBlock >
+                                    <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}"/>
+                                <!--<Run Text="2.1211" Style="{StaticResource RunStyle_text}"/>-->
                                             <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                            </TextBlock>
+                                </TextBlock>
+                            </Viewbox>
+
                         </StackPanel>
                         <Button Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}"
                             Style="{StaticResource Styles.Button.Empty}" Click="button_density_Click" Tag="{Binding .}">
                             <StackPanel Margin="3" >
                                 <TextBlock Text="厚度" Style="{StaticResource TextBlockStyle_title}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock>
                                         <Run Text="{Binding Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
                                         <Run Text="um" Style="{StaticResource RunStyle_unit}" />
@@ -174,7 +183,7 @@
 
                     <StackPanel Margin="3" Grid.Row="1" >
                         <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                        <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                        <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                             <TextBlock >
                                 <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
                                 <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
@@ -198,7 +207,7 @@
                                                 >
                             <StackPanel Margin="3" >
                                 <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox  Style="{StaticResource ViewbloxStyle_itemValue_XXXXXX}">
                                     <TextBlock>
                                         <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                                         <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V6/UcWeighterItemV6_2.xaml

@@ -13,6 +13,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+
         </ResourceDictionary>
     </UserControl.Resources>
     <Border Style="{StaticResource BorderStyle_block}" d:DataContext="{StaticResource weightSystemUt}">
@@ -70,16 +71,17 @@
                         <StackPanel>
                             <StackPanel Margin="3">
                                 <TextBlock Text="当前比例" Style="{StaticResource TextBlockStyle_title}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                     <TextBlock>
                                         <Run Text="{Binding ScrewPDisp,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
-                                        <Run Text="%" Style="{StaticResource RunStyle_unit}" />
+                                       <!--<Run Text="100" Style="{StaticResource RunStyle_text}"/>-->
+                                       <Run Text="%" Style="{StaticResource RunStyle_unit}" />
                                     </TextBlock>
                                 </Viewbox>
                             </StackPanel>
                             <StackPanel  Margin="3" >
                                 <TextBlock Text="设置比例" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                                <Viewbox Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120" HorizontalAlignment="Left">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                     <TextBlock >
                                         <Run Text="{Binding ScrewPSet,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}"/>
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
@@ -90,16 +92,17 @@
                         <StackPanel Grid.Column="1">
                             <StackPanel Margin="3">
                                 <TextBlock Text="层厚度" Style="{StaticResource TextBlockStyle_title}"/>
-                                <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                     <TextBlock>
                                         <Run Text="{Binding Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" />
+                                        <!--<Run Text="103" Style="{StaticResource RunStyle_text}"/>-->
                                         <Run Text="um" Style="{StaticResource RunStyle_unit}" />
                                     </TextBlock>
                                 </Viewbox>
                             </StackPanel>
                             <StackPanel  Margin="3" >
                                 <TextBlock Text="厚度比" Style="{StaticResource TextBlockStyle_title}"/>
-                                <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
+                                <Viewbox Style="{StaticResource ViewbloxStyle_itemValue_XXX}">
                                     <TextBlock >
                                         <Run Text="{Binding ThicknessPercent,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}"/>
                                         <Run Text="%" Style="{StaticResource RunStyle_unit}" />
@@ -112,21 +115,17 @@
                 <StackPanel Margin="3" 
                             Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
                     <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
-                    <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                        <TextBlock >
-                                        <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" />
-                                        <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
-                    </Viewbox>
+                    <TextBlock >
+                            <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" />
+                            <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
+                    </TextBlock>
                 </StackPanel>
                 <StackPanel Margin="3" >
                     <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
-                    <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                        <TextBlock >
-                        <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
-                        <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
-                        </TextBlock>
-                    </Viewbox>
+                    <TextBlock >
+                            <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
+                            <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
+                    </TextBlock>
                 </StackPanel>
                 <Grid>
                     <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
@@ -173,12 +172,10 @@
                                                 >
                     <StackPanel Margin="3" >
                         <TextBlock Text="运行频率" Style="{StaticResource TextBlockStyle_title_activity}"/>
-                        <Viewbox HorizontalAlignment="Left" Stretch="Uniform" StretchDirection="DownOnly" MaxWidth="120">
-                            <TextBlock >
+                        <TextBlock >
                             <Run Text="{Binding ScrewMotorFreq,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}" />
                             <Run Text="Hz" Style="{StaticResource RunStyle_unit}" />
-                            </TextBlock>
-                        </Viewbox>
+                        </TextBlock>
                     </StackPanel>
                 </Button>
                 <StackPanel Margin="3">

Project.FLY.Weight/FLY.Weight.UI.Client/WdRatioSet.xaml

@@ -7,7 +7,7 @@
         xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
         xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
         mc:Ignorable="d"
-        Title="Window_RatioSet" WindowStartupLocation="CenterScreen" Loaded="WindowBigClose_Loaded" >
+        Title="Window_RatioSet" WindowStartupLocation="CenterScreen" Loaded="WindowBigClose_Loaded" SizeToContent="WidthAndHeight" >
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -65,7 +65,7 @@
                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/h" />
                     </StackPanel>
                 </StackPanel>
-                <Button Style="{StaticResource Styles.Button2}" Content="当前->设置" FontSize="30" Width="auto" Click="button_autoset_Click"  />
+                <Button Style="{StaticResource Styles.Button2}" Content="当前->设置" Width="auto" FontSize="30" Click="button_autoset_Click"  />
             </StackPanel>
         </Grid>
 

Project.FLY.Weight/FLY.Weight.UI.Client/WdRatioSet.xaml.cs

@@ -47,11 +47,14 @@ namespace FLY.Weight.UI.Client
         {
             var mWeighterCsService = obj;
             mWeighterCsService.Accessory.TotalFlowSetting = (int)(mWeighterCsService.Accessory.TotalFlow);
-            for (int i = 0; i < mWeighterCsService.Items.Count(); i++)
+
+            //最后一个不设置
+            for (int i = 0; i < mWeighterCsService.Items.Count()-1; i++)
             {
                 WeighterC w = mWeighterCsService.Items[i];
                 w.ScrewPSet = w.ScrewPDisp;
             }
+            
             FLY.ControlLibrary.Window_Tip.Show("设置完成", "等待一会,设置比例就会等于当前比例", TimeSpan.FromSeconds(2));
         }
     }

Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.6.0.0")]
-[assembly: AssemblyFileVersion("7.6.0.0")]
+[assembly: AssemblyVersion("7.6.1.0")]
+[assembly: AssemblyFileVersion("7.6.1.0")]
 [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]

thick_public @ bc6a413f

-Subproject commit 5b685a509a4a6a96fa3bd226deb23aa00426c21a
+Subproject commit bc6a413f1ab742c46233574738f501f9034fdf9a

脚本/hemeiInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"7.6.2.1",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.6.2.1_20221019.7z"
+  "InstallZipVersion":"7.6.3.1",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.6.3.1_20221106.7z"
 }
\ No newline at end of file

脚本/版本描述.md

+# 和美安装包_v7.6.3-20221105
+
+## 测厚仪服务器 v7.6.2
+1. 优化 3个月才会提示需要数据归档
+
+## 测厚仪客户端 v7.6.3
+1. 修复 称重数位多，导致某些层比其它层显示短
+
+## 扫描测厚仪服务器 v7.6.1
+1. 优化 3个月才会提示需要数据归档
+   
+## 扫描测厚仪客户端 v7.6.3
+1. 修复 称重数位多，导致某些层比其它层显示短
+2. 修复 吸料没显示状态
+   
+## 自动风环 v7.6.1
+## 称重 v7.6.1
+1. 修复 I层 设置比例与当前比例 地址错误
+   
+## 称重单组 v7.6.0
+## 收卷 v7.6.0
+## IBC v7.6.0
+## 下吹 v7.6.0
+## 吹膜数据库浏览器 v7.0.0
+
+<br/>
+<br/>
+<br/>
+
 # 和美安装包_v7.6.2-20221018
 
 ## 测厚仪服务器 v7.6.1