Преглед изворни кода

修复ProductGlobalParamEx初始无数据问题

844184169 пре 6 месеци
родитељ
комит
0b788b073e

+ 3 - 0
TeamAAS-VM/Core/Management.cs

@@ -1128,6 +1128,9 @@ namespace TeamAAS_VP.Core
             if (currentProduct == null) return;
             try
             {
+                if (currentProduct.GlobalParamEx == null) currentProduct.GlobalParamEx = new Models.Product.ProductGlobalParamEx();
+                if (currentProduct.GlobalParamEx.AssemblyPressure == null) currentProduct.GlobalParamEx.AssemblyPressure = new PressureModel();
+                if (currentProduct.GlobalParamEx.DownPressure == null) currentProduct.GlobalParamEx.DownPressure = new PressureModel();
                 await plc.WriteNodeAsync(addressConfig.PUT_Down_Time.Address, currentProduct.GlobalParamEx.AssemblyPressure.PressureTime);
                 await plc.WriteNodeAsync(addressConfig.PUT_WetOut_Num.Address, currentProduct.GlobalParamEx.AssemblyPressure.PressureNum);
                 await plc.WriteNodeAsync(addressConfig.PUT_WetOut_Num_max.Address, currentProduct.GlobalParamEx.AssemblyPressure.PressureNumMax);

+ 2 - 2
TeamAAS-VM/Models/Product/ProductGlobalParamEx.cs

@@ -4,7 +4,7 @@ namespace TeamAAS_VP.Models.Product
 {
     public class ProductGlobalParamEx : BindableBase
     {
-        private PressureModel _AssemblyPressure;
+        private PressureModel _AssemblyPressure = new PressureModel();
         /// <summary>
         /// 组装保压
         /// </summary>
@@ -14,7 +14,7 @@ namespace TeamAAS_VP.Models.Product
             set { SetProperty(ref _AssemblyPressure, value); }
         }
 
-        private PressureModel _DownPressure;
+        private PressureModel _DownPressure = new PressureModel();
         /// <summary>
         /// 后保压
         /// </summary>

+ 2 - 2
TeamAAS-VM/Views/Product/ProductParams.xaml

@@ -120,7 +120,7 @@
                         <StackPanel Orientation="Vertical"
                                     Margin="0">
                             <GroupBox Header="{lex:Loc 组装保压配置}"
-                                      Margin="0"
+                                      Margin="5"
                                       Width="200">
                                 <Grid Margin="10">
                                     <Grid.ColumnDefinitions>
@@ -198,7 +198,7 @@
                                 </Grid>
                             </GroupBox>
                             <GroupBox Header="{lex:Loc 后保压配置}"
-                                      Margin="20,0"
+                                      Margin="5"
                                       Width="200">
                                 <Grid Margin="10">
                                     <Grid.ColumnDefinitions>