Merge branch 'dev' of http://175.27.215.92:3000/wenjy/JYHB.SlnMesnac into dev

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/SlnMesnac.zip

SlnMesnac.WPF/Page/DevMonitorPage.xaml

@@ -24,9 +24,9 @@
                     <Button  x:Name="StopButton"   Style="{StaticResource  BUTTON_AGREE}" Content="一键停止"  FontSize="30" Background="OrangeRed" Width="180" Height="45"  Margin="0,0,20,0" Click="StopButton_Click"/>
 
                     <TextBlock Text="气压实时监测:" FontSize="25" VerticalAlignment="Center" Width="172"  Foreground="White" Margin="50 0 10 0" />
-                    <TextBlock  x:Name="PressureTxt" Text="0" Width="70" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                    <TextBlock  x:Name="PressureTxt" Text="0" Width="110" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                    
-                    <TextBlock Text="缓存区重量:" FontSize="25" VerticalAlignment="Center" Width="140"  Foreground="White" HorizontalAlignment="Left" Margin="150 0 10 0" />
+                    <TextBlock Text="缓存区重量:" FontSize="25" VerticalAlignment="Center" Width="140"  Foreground="White" HorizontalAlignment="Left" Margin="80 0 10 0" />
                     <TextBlock  x:Name="BufferWeightTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                     <Button  x:Name="SetStopWeightButton"   Content="设置重量阈值"  FontSize="25" Foreground="White" Background="CadetBlue" Width="200"  Height="60"  Margin="0 0 20 0" HorizontalAlignment="Left" Click="SetStopWeightButton_Click" />
 
@@ -35,7 +35,7 @@
                     <TextBlock   Visibility="Collapsed" x:Name="BagsAmountTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                     <Button   Visibility="Collapsed" x:Name="AmountChangeButton" Style="{StaticResource  BUTTON_AGREE}"  Content="数量调整"  FontSize="30" Background="CadetBlue" Width="180"  Height="60"  Margin="0 0 20 0" HorizontalAlignment="Left" Click="AmountChangeButton_Click"/>
 
-                    <Button   x:Name="MachineStopHistoryButton"   Content="停机记录"  FontSize="25" Foreground="White" Background="CadetBlue" Width="200"  Height="60"   Margin="50 0 20 0" HorizontalAlignment="Left" Click="MachineStopHistoryButton_Click"/>
+                    <Button   x:Name="MachineStopHistoryButton"   Content="停机记录"  FontSize="25" Foreground="White" Background="CadetBlue" Width="200"  Height="60"   Margin="30 0 20 0" HorizontalAlignment="Left" Click="MachineStopHistoryButton_Click"/>
 
                 </StackPanel>
             </Grid>

SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs

@@ -248,8 +248,8 @@ namespace SlnMesnac.WPF.Page
                 //  string Bags_Amount = _configInfoBusiness.GetConfigInfos().FirstOrDefault(x => x.ConfigKey == "包装袋余量").ConfigValue;
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                 {
-                    //  BagsAmountTxt.Text = Bags_Amount;
-                    PressureTxt.Text = pressure.ToString();
+                    //  BagsAmountTxt.Text = Bags_Amount; pressure.ToString();
+                    PressureTxt.Text = Math.Round(pressure, 2).ToString() + "MPa";//保留两位小数
                     BufferWeightTxt.Text = recipeManageCache.BufferWeight.ToString("F2");
 
                 }));

SlnMesnac.WPF/SlnMesnac.WPF.csproj

@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="devexpress.wpf.controls" Version="23.2.5" />
+    <!--<PackageReference Include="devexpress.wpf.controls" Version="23.2.5" />-->
     <PackageReference Include="Lierda.WPFHelper" Version="1.0.3" />
     <PackageReference Include="LiveCharts" Version="0.9.7" />
     <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />

SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs

@@ -18,7 +18,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static DevExpress.Drawing.Printing.Internal.DXPageSizeInfo;
+//using static DevExpress.Drawing.Printing.Internal.DXPageSizeInfo;
 
 
 #region << 版 本 注 释 >>