将保压上下限用于判断的值，移植到产品配方中

TeamAAS-VM/Core/FilePath.cs

@@ -61,10 +61,5 @@ namespace TeamAAS_VP.Core
         /// 后台脚本存放文件夹
         /// </summary>
         public static string BackgroundScriptPath = "..//Background Script";
-
-        /// <summary>
-        /// 保压参数存放路径
-        /// </summary>
-        public static string PressureParamterConfigPath = "..//Config//PressureParamterConfig.cfg";
     }
 }

TeamAAS-VM/Core/Management.cs

@@ -1123,23 +1123,17 @@ namespace TeamAAS_VP.Core
             var addressConfig = _configService.GetPlcAddresses();
             var plc = _plcService.GetPlcByNumber(addressConfig.PlcNo) as OpcUaClientPLC;
             if (plc == null || !plc.IsConnected) return;
+            // 获取当前产品
+            var currentProduct = _productService.GetCurrentProduct();
+            if (currentProduct == null) return;
             try
             {
-                if (!File.Exists(FilePath.PressureParamterConfigPath))
-                {
-                    List<PressureModel> models = new List<PressureModel>();
-                    models.Add(new PressureModel());
-                    models.Add(new PressureModel());
-                    models.Add(new PressureModel());
-                    FileHelper.WriteJsonFile(models, FilePath.PressureParamterConfigPath);
-                }
-                var PressureParam = FileHelper.ReadJsonFile<List<PressureModel>>(FilePath.PressureParamterConfigPath);
-                await plc.WriteNodeAsync(addressConfig.PUT_Down_Time.Address, PressureParam[0].PressureTime);
-                await plc.WriteNodeAsync(addressConfig.PUT_WetOut_Num.Address, PressureParam[0].PressureNum);
-                await plc.WriteNodeAsync(addressConfig.PUT_WetOut_Num_max.Address, PressureParam[0].PressureNumMax);
-                await plc.WriteNodeAsync(addressConfig.Down_Time.Address, PressureParam[1].PressureTime);
-                await plc.WriteNodeAsync(addressConfig.Down_WetOut_Num.Address, PressureParam[1].PressureNum);
-                await plc.WriteNodeAsync(addressConfig.Down_WetOut_Num_max.Address, PressureParam[1].PressureNumMax);
+                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);
+                await plc.WriteNodeAsync(addressConfig.Down_Time.Address, currentProduct.GlobalParamEx.DownPressure.PressureTime);
+                await plc.WriteNodeAsync(addressConfig.Down_WetOut_Num.Address, currentProduct.GlobalParamEx.DownPressure.PressureNum);
+                await plc.WriteNodeAsync(addressConfig.Down_WetOut_Num_max.Address, currentProduct.GlobalParamEx.DownPressure.PressureNumMax);
             }
             catch (Exception)
             {
@@ -2812,9 +2806,6 @@ namespace TeamAAS_VP.Core
                                     }
 
                                     await _systemDatabaseService.RecordAssemblyAsync(assemblyRecord);
-                                    var pressureParam = FileHelper.ReadJsonFile<List<PressureModel>>(FilePath.PressureParamterConfigPath);
-                                    var p1 = pressureParam[0];//组装压力
-                                    var p2 = pressureParam[1];//保压压力
 
                                     LogHelper.WriteLogMes($"【mes开始ADD】");
                                     SendTaskMessage($"mes开始ADD", MessageLevel.Info);
@@ -2828,7 +2819,7 @@ namespace TeamAAS_VP.Core
                                         try
                                         {
                                             assypress = currentPressure[0].ToString("F2");
-                                            if (currentPressure[0] >= p1.PressureDownLimit && currentPressure[0] <= p1.PressureUpLimit)
+                                            if (currentPressure[0] >= currentProduct.GlobalParamEx.AssemblyPressure.PressureDownLimit && currentPressure[0] <= currentProduct.GlobalParamEx.AssemblyPressure.PressureUpLimit)
                                             {
                                                 resultIndex = 1;
                                             }
@@ -2847,7 +2838,7 @@ namespace TeamAAS_VP.Core
                                         SendTaskMessage($"gap:{gap},组装压力:{assypress}", MessageLevel.Info);
                                         #region 数据
                                         bool assyPresRes;
-                                        if (currentPressure[0] >= p1.PressureDownLimit && currentPressure[0] <= p1.PressureUpLimit)
+                                        if (currentPressure[0] >= currentProduct.GlobalParamEx.AssemblyPressure.PressureDownLimit && currentPressure[0] <= currentProduct.GlobalParamEx.AssemblyPressure.PressureUpLimit)
                                         {
                                             assyPresRes = true;
                                         }
@@ -2889,8 +2880,8 @@ namespace TeamAAS_VP.Core
                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                             CTQ_NAME = "Assy_Pressure",
                                             CTQ_VALUE = assypress,
-                                            CTQ_LSL = p1.PressureDownLimit.ToString("F3"),
-                                            CTQ_USL = p1.PressureUpLimit.ToString("F3"),
+                                            CTQ_LSL = currentProduct.GlobalParamEx.AssemblyPressure.PressureDownLimit.ToString("F3"),
+                                            CTQ_USL = currentProduct.GlobalParamEx.AssemblyPressure.PressureUpLimit.ToString("F3"),
                                             PROCESS_END_TIME = serverTimeResult.Now.ToString(),
                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
@@ -2910,7 +2901,7 @@ namespace TeamAAS_VP.Core
                                         try
                                         {
                                             press = currentPressure[1].ToString("F2");
-                                            if (currentPressure[1] >= p2.PressureDownLimit && currentPressure[1] <= p2.PressureUpLimit)
+                                            if (currentPressure[1] >= currentProduct.GlobalParamEx.DownPressure.PressureDownLimit && currentPressure[1] <= currentProduct.GlobalParamEx.DownPressure.PressureUpLimit)
                                             {
                                                 resultIndex = 1;
                                             }
@@ -2924,13 +2915,13 @@ namespace TeamAAS_VP.Core
                                             press = "0";
                                             resultIndex = 2;
                                         }
-                                        presstime = p2.PressureTime.ToString();
+                                        presstime = currentProduct.GlobalParamEx.DownPressure.PressureTime.ToString();
                                         data.Add("pressure", press);
                                         data.Add("pressure_time", presstime);
                                         SendTaskMessage($"保压压力:{press},保压时间:{presstime}", MessageLevel.Info);
                                         #region 数据
                                         bool presRes;
-                                        if (currentPressure[1] >= p2.PressureDownLimit && currentPressure[1] <= p2.PressureUpLimit)
+                                        if (currentPressure[1] >= currentProduct.GlobalParamEx.DownPressure.PressureDownLimit && currentPressure[1] <= currentProduct.GlobalParamEx.DownPressure.PressureUpLimit)
                                         {
                                             presRes = true;
                                         }
@@ -2943,8 +2934,8 @@ namespace TeamAAS_VP.Core
                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                             CTQ_NAME = "Pressure",
                                             CTQ_VALUE = press,
-                                            CTQ_LSL = p2.PressureDownLimit.ToString("F3"),
-                                            CTQ_USL = p2.PressureUpLimit.ToString("F3"),
+                                            CTQ_LSL = currentProduct.GlobalParamEx.DownPressure.PressureDownLimit.ToString("F3"),
+                                            CTQ_USL = currentProduct.GlobalParamEx.DownPressure.PressureUpLimit.ToString("F3"),
                                             PROCESS_END_TIME = serverTimeResult.Now.ToString(),
                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
@@ -2964,8 +2955,8 @@ namespace TeamAAS_VP.Core
                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                             CTQ_NAME = "Pressure_time",
                                             CTQ_VALUE = Math.Round(double.Parse(presstime), 3).ToString(),
-                                            CTQ_LSL = p2.PressureTime.ToString("F3"),
-                                            CTQ_USL = p2.PressureTime.ToString("F3"),
+                                            CTQ_LSL = currentProduct.GlobalParamEx.DownPressure.PressureTime.ToString("F3"),
+                                            CTQ_USL = currentProduct.GlobalParamEx.DownPressure.PressureTime.ToString("F3"),
                                             PROCESS_END_TIME = serverTimeResult.Now.ToString(),
                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,

TeamAAS-VM/Models/Product/ProductGlobalParamEx.cs

@@ -0,0 +1,27 @@
+using Prism.Mvvm;
+
+namespace TeamAAS_VP.Models.Product
+{
+    public class ProductGlobalParamEx : BindableBase
+    {
+        private PressureModel _AssemblyPressure;
+        /// <summary>
+        /// 组装保压
+        /// </summary>
+        public PressureModel AssemblyPressure
+        {
+            get { return _AssemblyPressure; }
+            set { SetProperty(ref _AssemblyPressure, value); }
+        }
+
+        private PressureModel _DownPressure;
+        /// <summary>
+        /// 后保压
+        /// </summary>
+        public PressureModel DownPressure
+        {
+            get { return _DownPressure; }
+            set { SetProperty(ref _DownPressure, value); }
+        }
+    }
+}

TeamAAS-VM/Models/Product/ProductModel.cs

@@ -146,6 +146,16 @@ namespace TeamAAS_VP.Models
             set { SetProperty(ref _IsUserUpCamera, value); }
         }
 
+        private ProductGlobalParamEx _GlobalParamEx = new ProductGlobalParamEx();
+        /// <summary>
+        /// 全局参数扩展（保压/检测上下限）
+        /// </summary>
+        public ProductGlobalParamEx GlobalParamEx
+        {
+            get { return _GlobalParamEx; }
+            set { SetProperty(ref _GlobalParamEx, value); }
+        }
+
         private Guid _FixedUpCamera1ProcedureId;
         /// <summary>
         /// 固定向上相机1视觉流程ID
@@ -435,7 +445,7 @@ namespace TeamAAS_VP.Models
             set { SetProperty(ref _ScrewCameraPoints, value); }
         }
 
-        private PlcPoint _ScrewCameraLocalPos1= new PlcPoint();
+        private PlcPoint _ScrewCameraLocalPos1 = new PlcPoint();
         /// <summary>
         /// 锁付拍照点1对应的产品坐标系中的点位
         /// </summary>
@@ -571,7 +581,7 @@ namespace TeamAAS_VP.Models
             {
                 GlobalParamListCollection = new ObservableCollection<ProductGlobalParam>();
             }
-            globalParam.Number= GlobalParamListCollection.Count + 1;
+            globalParam.Number = GlobalParamListCollection.Count + 1;
             GlobalParamListCollection.Add(globalParam);
         }
 
@@ -591,7 +601,7 @@ namespace TeamAAS_VP.Models
                 gp.Number = number;
                 number++;
             }
-            GlobalParamListCollection=new ObservableCollection<ProductGlobalParam>(sortedList);
+            GlobalParamListCollection = new ObservableCollection<ProductGlobalParam>(sortedList);
         }
 
         public ProductModel Clone()
@@ -611,6 +621,7 @@ namespace TeamAAS_VP.Models
                 Accels = this.Accels,
                 Power = this.Power,
                 IsUserUpCamera = this.IsUserUpCamera,
+                GlobalParamEx = this.GlobalParamEx,
                 GlobalParamListCollection = new ObservableCollection<ProductGlobalParam>(this.GlobalParamListCollection.Select(gp => gp.Copy())),
                 PickCameraPoints = this.PickCameraPoints,
                 PickPoints = this.PickPoints,

TeamAAS-VM/TeamAAS-VP.csproj

@@ -548,6 +548,7 @@
     <Compile Include="Models\PhotoCaptureRecord.cs" />
     <Compile Include="Models\PressureModel.cs" />
     <Compile Include="Models\ProductWithMes.cs" />
+    <Compile Include="Models\Product\ProductGlobalParamEx.cs" />
     <Compile Include="Models\ScrewFeederBatchRecord.cs" />
     <Compile Include="Models\ThrowRecord.cs" />
     <Compile Include="Services\MesService.cs" />

TeamAAS-VM/ViewModels/SettingViewModel.cs

@@ -370,21 +370,6 @@ namespace TeamAAS_VP.ViewModels
             set { SetProperty(ref _CardReaderConfig, value); }
         }
 
-        private PressureModel _AssemblyPressureConfig;
-
-        public PressureModel AssemblyPressureConfig
-        {
-            get { return _AssemblyPressureConfig; }
-            set { SetProperty(ref _AssemblyPressureConfig, value); }
-        }
-
-        private PressureModel _DownPressureConfig;
-
-        public PressureModel DownPressureConfig
-        {
-            get { return _DownPressureConfig; }
-            set { SetProperty(ref _DownPressureConfig, value); }
-        }
         private ObservableCollection<ProductModel> _ProductList;
         public ObservableCollection<ProductModel> ProductList
         {
@@ -1277,17 +1262,7 @@ namespace TeamAAS_VP.ViewModels
         {
             try
             {
-                if (!File.Exists(FilePath.PressureParamterConfigPath))
-                {
-                    List<PressureModel> models = new List<PressureModel>();
-                    models.Add(new PressureModel());
-                    models.Add(new PressureModel());
-                    models.Add(new PressureModel());
-                    FileHelper.WriteJsonFile(models, FilePath.PressureParamterConfigPath);
-                }
-                var pressureParam = FileHelper.ReadJsonFile<List<PressureModel>>(FilePath.PressureParamterConfigPath);
-                this.AssemblyPressureConfig = pressureParam[0];
-                this.DownPressureConfig = pressureParam[1];
+
             }
             catch (Exception)
             {
@@ -1656,7 +1631,6 @@ namespace TeamAAS_VP.ViewModels
             {
                 try
                 {
-                    SavePressureConfig();
                     var sysConfig = _configService.GetSystemConfiguration();
                     sysConfig.WorkMode = WorkMode;
                     sysConfig.PickPointNum = PickPointNum;
@@ -1698,14 +1672,6 @@ namespace TeamAAS_VP.ViewModels
             }
         }
 
-        private void SavePressureConfig()
-        {
-            List<PressureModel> models = new List<PressureModel>();
-            models.Add(AssemblyPressureConfig);
-            models.Add(DownPressureConfig);
-            FileHelper.WriteJsonFile(models, FilePath.PressureParamterConfigPath);
-        }
-
         /// <summary>
         /// 保存读卡器配置
         /// </summary>

TeamAAS-VM/Views/Product/ProductParams.xaml

@@ -78,6 +78,7 @@
 
             <Grid>
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" />
                     <ColumnDefinition Width="auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
@@ -107,11 +108,181 @@
                         </StackPanel>
                     </ScrollViewer>
                 </Expander>
+                <!--产品检测判断的上下限-->
                 <Grid Grid.Column="1"
                       IsEnabled="{Binding IsAllowEdit}"
                       Margin="10"
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                  HorizontalScrollBarVisibility="Disabled"
+                                  CanContentScroll="True">
+                        <StackPanel Orientation="Vertical"
+                                    Margin="0">
+                            <GroupBox Header="{lex:Loc 组装保压配置}"
+                                      Margin="0"
+                                      Width="200">
+                                <Grid Margin="10">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{lex:Loc 保压时间}"
+                                               Grid.Row="0"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.AssemblyPressure.PressureTime,Mode=TwoWay}"
+                                             Grid.Row="0"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="s"
+                                               Grid.Row="0"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="{lex:Loc 保压压力}"
+                                               Grid.Row="1"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.AssemblyPressure.PressureNum,Mode=TwoWay}"
+                                             Grid.Row="1"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="1"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="{lex:Loc 保压最大值}"
+                                               Grid.Row="2"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.AssemblyPressure.PressureNumMax,Mode=TwoWay}"
+                                             Grid.Row="2"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="2"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="保压上限:"
+                                               Grid.Row="3"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.AssemblyPressure.PressureUpLimit,Mode=TwoWay}"
+                                             Grid.Row="3"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="3"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="保压下限:"
+                                               Grid.Row="4"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.AssemblyPressure.PressureDownLimit,Mode=TwoWay}"
+                                             Grid.Row="4"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="4"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                </Grid>
+                            </GroupBox>
+                            <GroupBox Header="{lex:Loc 后保压配置}"
+                                      Margin="20,0"
+                                      Width="200">
+                                <Grid Margin="10">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{lex:Loc 保压时间}"
+                                               Grid.Row="0"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.DownPressure.PressureTime,Mode=TwoWay}"
+                                             Grid.Row="0"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="s"
+                                               Grid.Row="0"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="{lex:Loc 保压压力}"
+                                               Grid.Row="1"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.DownPressure.PressureNum,Mode=TwoWay}"
+                                             Grid.Row="1"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="1"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="{lex:Loc 保压最大值}"
+                                               Grid.Row="2"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.DownPressure.PressureNumMax,Mode=TwoWay}"
+                                             Grid.Row="2"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="2"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="保压上限:"
+                                               Grid.Row="3"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.DownPressure.PressureUpLimit,Mode=TwoWay}"
+                                             Grid.Row="3"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="3"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                    <TextBlock Text="保压下限:"
+                                               Grid.Row="4"
+                                               Grid.Column="0"
+                                               HorizontalAlignment="Right" />
+                                    <TextBox Text="{Binding SelectProduct.GlobalParamEx.DownPressure.PressureDownLimit,Mode=TwoWay}"
+                                             Grid.Row="4"
+                                             Grid.Column="1"
+                                             Margin="6,0" />
+                                    <TextBlock Text="kg"
+                                               Grid.Row="4"
+                                               Grid.Column="2"
+                                               HorizontalAlignment="Right" />
+                                </Grid>
+                            </GroupBox>
+                        </StackPanel>
+                    </ScrollViewer>
+                </Grid>
+                <Grid Grid.Column="2"
+                      IsEnabled="{Binding IsAllowEdit}"
+                      Margin="10"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center">
 
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />

TeamAAS-VM/Views/SettingView.xaml

@@ -2853,163 +2853,7 @@
                                 </Grid>
                             </GroupBox>
 
-                            <GroupBox Header="{lex:Loc 组装保压配置}"
-                                      Margin="0"
-                                      Width="200">
-                                <Grid Margin="10">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="auto" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{lex:Loc 保压时间}"
-                                               Grid.Row="0"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding AssemblyPressureConfig.PressureTime,Mode=TwoWay}"
-                                             Grid.Row="0"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="s"
-                                               Grid.Row="0"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="{lex:Loc 保压压力}"
-                                               Grid.Row="1"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding AssemblyPressureConfig.PressureNum,Mode=TwoWay}"
-                                             Grid.Row="1"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="1"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="{lex:Loc 保压最大值}"
-                                               Grid.Row="2"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding AssemblyPressureConfig.PressureNumMax,Mode=TwoWay}"
-                                             Grid.Row="2"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="2"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="保压上限:"
-                                               Grid.Row="3"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding AssemblyPressureConfig.PressureUpLimit,Mode=TwoWay}"
-                                             Grid.Row="3"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="3"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="保压下限:"
-                                               Grid.Row="4"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding AssemblyPressureConfig.PressureDownLimit,Mode=TwoWay}"
-                                             Grid.Row="4"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="4"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                </Grid>
-                            </GroupBox>
-                            <GroupBox Header="{lex:Loc 后保压配置}"
-                                      Margin="20,0"
-                                      
-                                      Width="200">
-                                <Grid Margin="10">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="auto" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock Text="{lex:Loc 保压时间}"
-                                               Grid.Row="0"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding DownPressureConfig.PressureTime,Mode=TwoWay}"
-                                             Grid.Row="0"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="s"
-                                               Grid.Row="0"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="{lex:Loc 保压压力}"
-                                               Grid.Row="1"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding DownPressureConfig.PressureNum,Mode=TwoWay}"
-                                             Grid.Row="1"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="1"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="{lex:Loc 保压最大值}"
-                                               Grid.Row="2"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding DownPressureConfig.PressureNumMax,Mode=TwoWay}"
-                                             Grid.Row="2"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="2"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="保压上限:"
-                                               Grid.Row="3"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding DownPressureConfig.PressureUpLimit,Mode=TwoWay}"
-                                             Grid.Row="3"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="3"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                    <TextBlock Text="保压下限:"
-                                               Grid.Row="4"
-                                               Grid.Column="0"
-                                               HorizontalAlignment="Right" />
-                                    <TextBox Text="{Binding DownPressureConfig.PressureDownLimit,Mode=TwoWay}"
-                                             Grid.Row="4"
-                                             Grid.Column="1"
-                                             Margin="6,0" />
-                                    <TextBlock Text="kg"
-                                               Grid.Row="4"
-                                               Grid.Column="2"
-                                               HorizontalAlignment="Right" />
-                                </Grid>
-                            </GroupBox>
+                            
                         </StackPanel>
                     </StackPanel>
                 </ScrollViewer>