修改bug

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -147,8 +147,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             MessageBoxResult boxResult = MessageBox.Show("确认删除此条数据?", "确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
             if (boxResult == MessageBoxResult.OK)
             {
-                
+                //查找测试方案名称的id
+                var schID = _basicPlcTestSchemeDtlService.Find(id)?.scheme_id;
                 _basicPlcTestSchemeDtlService.Delete(id);
+                
+                //如果测试项详细表中没有了这个测试方案，把测试方案表中的方案数据也删除
+                var findSchDetails=_basicPlcTestSchemeDtlService.FindAllBySchId(schID.Value);
+                //删除测试方案表中的数据
+                if(findSchDetails.Count==0) 
+                {
+                    int delId =Convert.ToInt32(schID.Value);
+                    _basicPlcTestSchemeService.Delete(delId);
+                }
                 //更新表格，重新获取
                 GetContent();
             }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -902,15 +902,15 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                     ProVisibility = Visibility.Visible;
                                 }));
 
-                                readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
-                                if (readResult == item.PlcValue)
-                                {
-                                    break;
-                                }
+                              
+                                //if (readResult == item.PlcValue)
+                                //{
+                                //    break;
+                                //}
                                 await Task.Delay(1000);
                             }
                         });
-
+                        readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
                         ProVisibility = Visibility.Hidden;
                         ///实时值记录
                         item.RealValue = readResult;

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -489,6 +489,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             bool preBool=TestPreceditionMethod();
             if(!preBool)
             {
+                StepIndex = 0;
+                StartEnalbe = true;
                 return;
             }
             
@@ -496,6 +498,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             bool isAction=TestActionMethod();
             if (!isAction)
             {
+                StepIndex = 0;
+                StartEnalbe = true;
                 return;
             }
          
@@ -503,6 +507,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             bool isJudgeResult=await TestJudgementMethod();
             if (!isJudgeResult)
             {
+                StepIndex = 0;
+                StartEnalbe = true;
                 return;
             }
             _logger.LogInformation($"手动测试完成。方案名{ScheduleName}，测试项{TestName}");
@@ -594,7 +600,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
                         item.RealValue = readResult;
                         item.TestTime = DateTime.Now;
-                        if (readResult.Trim() == plcValue.Trim())
+                        if (readResult.Trim() == plcValue?.Trim())
                         {
                             item.TestResult = "合格";
                             countCond++;

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -223,6 +223,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 //输出文件
 
                 document.GeneratePdf(pathToPDF);
+                MessageBox.Show("生成PDF报告成功！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
             }
             catch(Exception ex)
             {
@@ -459,9 +460,11 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 basicPlcTestSchemeDto.TestStatus = "已测试";
                                 break;
                         }
+                        //只显示已测试的项
+                        allConfigList.Add(basicPlcTestSchemeDto);
+                        conditionConfig.Add(basicPlcTestSchemeDto);
                     }
-                    allConfigList.Add(basicPlcTestSchemeDto);
-                    conditionConfig.Add(basicPlcTestSchemeDto);
+                   
 
                 }
                 //默认显示的第一页

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/WritePLCViewModel.cs

@@ -16,6 +16,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         public WritePLCViewModel()
         {
             SureCommand = new DelegateCommand<object>(Sure);
+            CancelCommand = new DelegateCommand<object>(Cancel);
             CloseCommand = new DelegateCommand<object>(CloseMethod);
         }
 
@@ -50,7 +51,10 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         {
      
         }
-
+        private void Cancel(object obj)
+        {
+            RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+        }
         public void OnDialogOpened(IDialogParameters parameters)
         {
            
@@ -100,6 +104,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         #region 命令绑定
         public DelegateCommand<object> CloseCommand { set; get; }
         public DelegateCommand<object> SureCommand { set; get; }
+        public DelegateCommand<object> CancelCommand { set; get; }
         #endregion
     }
 }

BlankApp1/BlankApp1/ViewModels/StatisticsViewModel.cs

@@ -121,9 +121,10 @@ namespace BlankApp1.ViewModels
                                 basicPlcTestSchemeDto.TestStatus = "已测试";
                                 break;
                         }
+                        allConfigList.Add(basicPlcTestSchemeDto);
+                        conditionConfig.Add(basicPlcTestSchemeDto);
+
                     }
-                    allConfigList.Add(basicPlcTestSchemeDto);
-                    conditionConfig.Add(basicPlcTestSchemeDto);
 
                 }
                 //默认显示的第一页

BlankApp1/BlankApp1/Views/BasicConfigView/CopySchView.xaml

@@ -14,10 +14,10 @@
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal">
             <TextBlock Text="测试方案名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-            <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
+            <TextBox  Height="28" Width="160" Text="{Binding ScheduleName}" />
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBox  Height="28" Width="160" Text="{Binding DeviceName}"/>
             </StackPanel>
             <Button  Content="确认" Width="80"  Margin="5,0"  Command="{Binding SureCommand}" Style="{StaticResource NormalButtonStyle}" />
         </StackPanel>
@@ -27,7 +27,7 @@
             ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0"  >
                
                 <DataGrid.Columns >
-                    <DataGridTemplateColumn CanUserResize="False" Width="60">
+                    <DataGridTemplateColumn CanUserResize="False" Width="50">
                         <DataGridTemplateColumn.HeaderTemplate>
                             <DataTemplate>
                                 <CheckBox Content="全选" IsChecked="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Path=AllSelected}" Foreground="White" >

BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -7,7 +7,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:prism="http://prismlibrary.com/" 
              BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="600" Width="1000" >
+             Height="700" Width="1100" >
    
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">
@@ -54,7 +54,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="前置项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>
@@ -122,7 +122,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="输入项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>
@@ -191,7 +191,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="结果项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>

BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -8,7 +8,7 @@
              xmlns:prism="http://prismlibrary.com/" 
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="600" Width="1000" >
+             Height="700" Width="1100" >
 
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">
@@ -55,7 +55,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="前置项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>
@@ -124,7 +124,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="输入项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>
@@ -194,7 +194,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="1.3*"/>
+                <ColumnDefinition Width="1.6*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="结果项" Style="{StaticResource NormalTextBlockStyle}" TextAlignment="Center">
             </TextBlock>
@@ -272,9 +272,9 @@
         </Grid>
         <UniformGrid  Grid.Row="5" Columns="4">
             <Button  Content="开始检测" Width="80" IsEnabled="{Binding StartEnalbe}" Height="30" FontSize="12"   Command="{Binding StartCommand}" Style="{DynamicResource WD.PrimaryButton}" />
-            <Button  Content="上一步" Width="80"    Command="{Binding PreviousCommand}" Style="{StaticResource NormalButtonStyle}" />
-            <Button  Content="下一步" Width="80"    Command="{Binding NextCommand}" Style="{StaticResource NormalButtonStyle}" />
-            <Button  Content="完成" Width="80"    Command="{Binding DoneCommand}" Style="{StaticResource NormalButtonStyle}" />
+            <Button  Content="上一步" Width="80" IsEnabled="{Binding StartEnalbe}" Height="30" FontSize="12"   Command="{Binding PreviousCommand}" Style="{DynamicResource WD.PrimaryButton}" />
+            <Button  Content="下一步" Width="80" IsEnabled="{Binding StartEnalbe}" Height="30" FontSize="12"   Command="{Binding NextCommand}" Style="{DynamicResource WD.PrimaryButton}" />
+            <Button  Content="完成" Width="80"  IsEnabled="{Binding StartEnalbe}" Height="30" FontSize="12"  Command="{Binding DoneCommand}" Style="{DynamicResource WD.PrimaryButton}" />
         </UniformGrid>
         <Grid Grid.Row="2">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center">