解决bug

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddOrEditSchViewModel.cs

@@ -700,17 +700,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         bas_plc_test_scheme schEntity = _mapper.Map<BasicPlcTestSchemeDto, bas_plc_test_scheme>(schDto);
                         _basicPlcTestSchemeService.Add(schEntity);
 
-                        //清空已填写的内容
-                        ScheduleName = string.Empty;
-                        DeviceKindName = string.Empty;
-                        SelectTest = string.Empty;
-                        TestName = string.Empty;
-                        BeforeSelectJudge = string.Empty;
-                        SelectLogic = string.Empty;
-                        SelectInJudge = string.Empty;
-                        InSelectLogic = string.Empty;
-                        SelectOutJudge = string.Empty;
-                        OutSelectLogic = string.Empty;
+           
                     }
 
                 }
@@ -738,8 +728,23 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     AddOrEditDetailsToDb(id);
 
                 }
-                //gen'x'g
+                //更新已有的测试项
                 GetExistSchs();
+                //清空已填写的内容
+           
+                DeviceKindName = string.Empty;
+                SelectTest = string.Empty;
+                TestName = string.Empty;
+                BeforeSelectJudge = string.Empty;
+        
+                SelectLogic = string.Empty;
+                SelectInJudge = string.Empty;
+                InSelectLogic = string.Empty;
+                SelectOutJudge = string.Empty;
+                OutSelectLogic = string.Empty;
+                BeforeConList = null;
+                InConList = null;
+                OutConList = null;
             }
             catch (Exception ex)
             {

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -182,17 +182,14 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             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) 
+                var schDtls = _basicPlcTestSchemeDtlService.FindAllBySchId(id);
+                foreach(var item in schDtls)
                 {
-                    int delId =Convert.ToInt32(schID.Value);
-                    _basicPlcTestSchemeService.Delete(delId);
+                    _basicPlcTestSchemeDtlService.Delete((int)item.scheme_dtl_id);
                 }
+                //删除测试方案
+                _basicPlcTestSchemeService.Delete(id);
+
                 //更新表格，重新获取
                 GetContent();
             }

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -98,13 +98,7 @@
                                             <TextBlock  Text="删除" VerticalAlignment="Center" Foreground="Blue"/>
                                         </StackPanel>
                                     </Button>
-                                <Button  Width="auto" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"
-       Command="{Binding DataContext.CopyCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" CommandParameter="{Binding SchemeName}" Cursor="Hand" >
-
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock  Text="复制方案" VerticalAlignment="Center" Foreground="Blue"/>
-                                    </StackPanel>
-                                </Button>
+                              
                             </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>