修改测试项获取代码

BlankApp1/BizService/BasicPlcTestSchemeDtlService.cs

@@ -7,7 +7,11 @@ using System.Threading.Tasks;
 
 namespace BizService
 {
-    public  class BasicPlcTestSchemeDtlService : BaseService<bas_plc_test_scheme_dtl>, IBasicPlcTestSchemeDtlService
+    public class BasicPlcTestSchemeDtlService : BaseService<bas_plc_test_scheme_dtl>, IBasicPlcTestSchemeDtlService
     {
+        public List<bas_plc_test_scheme_dtl> FindAllBySchId(long schemeId)
+        {
+            return base.GetList(x => x.scheme_id == schemeId);
+        }
     }
 }

BlankApp1/BizService/IBasicPlcTestSchemeDtlService.cs

@@ -9,5 +9,11 @@ namespace BizService
 {
     public  interface IBasicPlcTestSchemeDtlService : IBaseService<bas_plc_test_scheme_dtl>
     {
+        /// <summary>
+        /// 更具schid查找所有测试项
+        /// </summary>
+        /// <param name="schemeName"></param>
+        /// <returns></returns>
+        public List<bas_plc_test_scheme_dtl> FindAllBySchId(long schemeId);
     }
 }

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -45,14 +45,32 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             AddPlanCommand = new DelegateCommand<string>(AddPlan);
             EditCommand = new DelegateCommand<object>(Edit);
             DeleteCommand = new DelegateCommand<object>(Delete);
+            GetConfigOption();
             GetContent();
         }
 
-        private void Edit(object obj)
+        /// <summary>
+        /// 获取配置
+        /// </summary>
+        private void GetConfigOption()
+        {
+            var configList = _optionConfigService.QueryList();
+            var _optionConfigs = _mapper.Map<List<OptionConfig>, List<OptionConfigDto>>(configList);
+            var tests = _optionConfigs.FindAll(x => x.TypeID == 1);
+            TestKinds = new List<string>();
+            foreach (var test in tests)
+            {
+                TestKinds.Add(test.ContentOption);
+            }
+        }
+         private void Edit(object obj)
         {
             
         }
-
+        /// <summary>
+        /// 删除操作
+        /// </summary>
+        /// <param name="obj"></param>
         private void Delete(object obj)
         {
             int id = Convert.ToInt32(obj);
@@ -60,7 +78,9 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             if (boxResult == MessageBoxResult.OK)
             {
                 
-
+                _basicPlcTestSchemeDtlService.Delete(id);
+                //，更新表格，重新获取
+                GetContent();
             }
         }
 
@@ -119,14 +139,49 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
 
             }
         }
-
+        /// <summary>
+        /// 获取解决方案
+        /// </summary>
         private void GetContent()
         {
-
+            //所有测试方案
             var schlist = _basicPlcTestSchemeService.QueryList();
-
             var configList = _mapper.Map<List<bas_plc_test_scheme>, List<BasicPlcTestSchemeDto>>(schlist);
-            BaseConfigList = new ObservableCollection<BasicPlcTestSchemeDto>(configList);
+            //清空集合
+            BaseConfigList.Clear();
+            //查找测试项名称
+            foreach (var sch in configList)
+            {
+                long schId = sch.SchemeId;
+                //在解决方案详细表中查找所有的测试项
+                var items=_basicPlcTestSchemeDtlService.FindAllBySchId(schId);
+                foreach(var item in items)
+                {
+                    BasicPlcTestSchemeDto basicPlcTestSchemeDto = new BasicPlcTestSchemeDto();
+                    basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
+                    basicPlcTestSchemeDto.SchemeName= sch.SchemeName;
+                    basicPlcTestSchemeDto.DeviceName= sch.DeviceName;
+                    switch(item.item_type)
+                    {
+                        case 0:
+                            basicPlcTestSchemeDto.ItemType = "前置项";
+                            break;
+                        case 1:
+                            basicPlcTestSchemeDto.ItemType = "PLC点位测试项";
+                            break; 
+                        case 2:
+                            basicPlcTestSchemeDto.ItemType = "Robot动作测试";
+                            break;
+                    }
+               
+                    basicPlcTestSchemeDto.ItemName=item.item_name;
+                    basicPlcTestSchemeDto.CreateBy=sch.CreateBy;
+                    basicPlcTestSchemeDto.CreateTime = sch.CreateTime;
+                    BaseConfigList.Add(basicPlcTestSchemeDto);
+                }
+
+            }
+          
         }
 
         private void PopMethod(string obj)
@@ -150,9 +205,26 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         public DelegateCommand<object> DeleteCommand { set; get; }
         public DelegateCommand<string> ExportCommand { set; get; }
         #endregion
+        #region 数据绑定
 
-
-
+        /// <summary>
+        /// 测试项
+        /// </summary>
+        private List<string> testKinds = new List<string>();
+        public List<string> TestKinds
+        {
+            get { return testKinds; }
+            set { testKinds = value; RaisePropertyChanged(); }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        private string selectTest;
+        public string SelectTest
+        {
+            get { return selectTest; }
+            set { selectTest = value; RaisePropertyChanged(); }
+        }
 
         private string myContent = string.Empty;
         public string MyContent
@@ -167,5 +239,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             get { return baseConfigList; }
             set { SetProperty(ref baseConfigList, value); }
         }
+
+        #endregion
+
     }
 }

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -31,7 +31,7 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <ComboBox  Height="28" Width="120" />
+                <ComboBox  Height="28" Width="120" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
             </StackPanel>
           
             
@@ -67,7 +67,8 @@
                 <DataGridTextColumn Header="序号" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                <DataGridTextColumn Header="测试项名称" Binding="{Binding Name}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                <DataGridTextColumn Header="测试项类型" Binding="{Binding ItemType}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                <DataGridTextColumn Header="测试项名称" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="创建者" Binding="{Binding CreateBy}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="创建时间" Binding="{Binding CreateTime}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTemplateColumn Header="操作"  CellStyle="{StaticResource MyDataGridCellStyle}">

BlankApp1/Model/Dto/BasicPlcTestSchemeDto.cs

@@ -11,6 +11,15 @@ namespace Model.Dto
         public long SchemeId { get; set; }
         public string SchemeName { get; set; }
 
+        /// <summary>
+        /// 测试项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 测试项类型
+        /// </summary>
+        public string ItemType { get; set; }
         /// <summary>
         /// Desc:设备名称
         /// Default: