添加测试记录查询

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -298,7 +298,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         public DelegateCommand<object> DeleteCommand { set; get; }
         public DelegateCommand<string> ExportCommand { set; get; }
 
-        public DelegateCommand PageUpdatedCmd { set; get; }
+  
         #endregion
         #region 数据绑定
         /// <summary>

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -211,7 +211,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             {
                 recordId = findRecordID.record_id;
             }
-            testStatus = 1;//测试状态赋值为1
+            testStatus = 99;//测试状态赋值为99
             //记录记录明细表中是否有这个方案明细ID的记录，没有则添加,有则更新记录状态
             var findRecordDetail = _iBizTestRecordDtlService.FindRecordDetailBySchDtlID(schDetailId);
             if (findRecordDetail == null)

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -14,6 +14,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using WPFDevelopers.Controls.Runtimes.Shell32;
 
 namespace PLCTool.ViewModels.BusinessManageViewModel
 {
@@ -23,29 +24,29 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private readonly IOptionConfigService _optionConfigService;
         private readonly IBasicPlcTestSchemeService _basicPlcTestSchemeService;
         private readonly IBasicPlcTestSchemeDtlService _basicPlcTestSchemeDtlService;
+        private readonly IBizTestRecordDtlService _iBizTestRecordDtlService;
         private readonly ILogger _logger;
         private readonly IMapper _mapper;
         private readonly IMenuService _menuService;
 
-        private List<BasicPlcTestSchemeDto> allConfigList = new List<BasicPlcTestSchemeDto>();//所有方案
-        private List<BasicPlcTestSchemeDto> conditionConfig = new List<BasicPlcTestSchemeDto>();//所有方案
+        private List<SchDtlWithResultModel> allConfigList = new List<SchDtlWithResultModel>();//所有方案
+        private List<SchDtlWithResultModel> conditionConfig = new List<SchDtlWithResultModel>();//所有方案
 
         private const int PageCount = 1; //每一页显示个数
-        public QueryViewModel(IDialogService dialog, IMenuService menuService, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IMapper mapper, ILogger logger)
+        public QueryViewModel(IDialogService dialog, IMenuService menuService, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordDtlService iBizTestRecordDtlService,IMapper mapper, ILogger logger)
         {
             _dialog = dialog;
             _optionConfigService = optionConfigService;
             _basicPlcTestSchemeService = basicPlcTestSchemeService;
             _basicPlcTestSchemeDtlService = basicPlcTestSchemeDtlService;
+            _iBizTestRecordDtlService = iBizTestRecordDtlService;
             _logger = logger;
             _mapper = mapper;
             _menuService = menuService;
             QueryCommand = new DelegateCommand<object>(Query);
             ResetCommand = new DelegateCommand<object>(Reset);
             ExportCommand = new DelegateCommand<string>(Export);
-            AddPlanCommand = new DelegateCommand<string>(AddPlan);
-            EditCommand = new DelegateCommand<object>(Edit);
-            DeleteCommand = new DelegateCommand<object>(Delete);
+  
 
             GetConfigOption();
             GetContent();
@@ -105,61 +106,9 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 TestKinds.Add(test.ContentOption);
             }
         }
-        /// <summary>
-        /// 编辑
-        /// </summary>
-        /// <param name="obj"></param>
-        private void Edit(object obj)
-        {
-            //测试方案明细主键ID
-            long id = Convert.ToInt64(obj);
-            DialogParameters parm = new DialogParameters();
-            parm.Add("Key", id);
-            //弹出详情对话框
-            _dialog.ShowDialog("AddOrEditSchView", parm, async callback =>
-            {
-                if (callback.Result == ButtonResult.OK)
-                {
-                    //更新表格，重新获取
-                    GetContent();
-                }
 
-            });
-        }
-        /// <summary>
-        /// 删除操作
-        /// </summary>
-        /// <param name="obj"></param>
-        private void Delete(object obj)
-        {
-            int id = Convert.ToInt32(obj);
-            MessageBoxResult boxResult = MessageBox.Show("确认删除此条数据?", "确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-            if (boxResult == MessageBoxResult.OK)
-            {
-
-                _basicPlcTestSchemeDtlService.Delete(id);
-                //更新表格，重新获取
-                GetContent();
-            }
-        }
-        /// <summary>
-        /// 新增按钮
-        /// </summary>
-        /// <param name="obj"></param>
-        private void AddPlan(string obj)
-        {
-
-            //弹出详情对话框
-            _dialog.ShowDialog("AddOrEditSchView", async callback =>
-            {
-                if (callback.Result == ButtonResult.OK)
-                {
-                    //更新表格，重新获取
-                    GetContent();
-                }
-
-            });
-        }
+  
+  
         /// <summary>
         /// excel导出
         /// </summary>
@@ -228,7 +177,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 var items = _basicPlcTestSchemeDtlService.FindAllBySchId(schId);
                 foreach (var item in items)
                 {
-                    BasicPlcTestSchemeDto basicPlcTestSchemeDto = new BasicPlcTestSchemeDto();
+                    //上面是测试方案明细
+                    SchDtlWithResultModel basicPlcTestSchemeDto = new SchDtlWithResultModel();
                     basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
                     basicPlcTestSchemeDto.SchemeName = sch.SchemeName;
                     basicPlcTestSchemeDto.DeviceName = sch.DeviceName;
@@ -248,7 +198,30 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     basicPlcTestSchemeDto.ItemName = item.item_name;
                     basicPlcTestSchemeDto.CreateBy = sch.CreateBy;
                     basicPlcTestSchemeDto.CreateTime = sch.CreateTime;
-
+                    //这里是测试项 结果和 测试记录明细状态
+                    var recordDetail=_iBizTestRecordDtlService.FindRecordDetailBySchDtlID(item.scheme_dtl_id);
+                    if(recordDetail != null)
+                    {
+                        switch(recordDetail.test_result)
+                        {
+                            case 0:
+                                basicPlcTestSchemeDto.TestResult = "不通过";
+                                break;
+                            case 1:
+                                basicPlcTestSchemeDto.TestResult = "通过";
+                                break;
+                        }
+
+                        switch (recordDetail.status)
+                        {
+                            case 0:
+                                basicPlcTestSchemeDto.TestStatus = "未测试";
+                                break;
+                            case 99:
+                                basicPlcTestSchemeDto.TestStatus = "已测试";
+                                break;
+                        }
+                    }
                     allConfigList.Add(basicPlcTestSchemeDto);
                     conditionConfig.Add(basicPlcTestSchemeDto);
 
@@ -286,14 +259,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         #endregion
         #region 命令绑定
 
-        public DelegateCommand<object> EditCommand { set; get; }
-        public DelegateCommand<string> AddPlanCommand { set; get; }
+ 
         public DelegateCommand<object> QueryCommand { set; get; }
         public DelegateCommand<object> ResetCommand { set; get; }
-        public DelegateCommand<object> DeleteCommand { set; get; }
+    
         public DelegateCommand<string> ExportCommand { set; get; }
 
-        public DelegateCommand PageUpdatedCmd { set; get; }
+        
         #endregion
         #region 数据绑定
         /// <summary>
@@ -385,8 +357,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             set { currentPage = value; RaisePropertyChanged(); CurrentPageChanged(); }
         }
 
-        private ObservableCollection<BasicPlcTestSchemeDto> baseConfigList = new ObservableCollection<BasicPlcTestSchemeDto>();
-        public ObservableCollection<BasicPlcTestSchemeDto> BaseConfigList
+        private ObservableCollection<SchDtlWithResultModel> baseConfigList = new ObservableCollection<SchDtlWithResultModel>();
+        public ObservableCollection<SchDtlWithResultModel> BaseConfigList
         {
             get { return baseConfigList; }
             set { SetProperty(ref baseConfigList, value); }

BlankApp1/BlankApp1/Views/BusinessManageView/QueryView.xaml

@@ -68,8 +68,8 @@
                 <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项类型" Binding="{Binding ItemType}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项名称" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                <DataGridTextColumn Header="测试结果" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                <DataGridTextColumn Header="状态" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                <DataGridTextColumn Header="测试结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                <DataGridTextColumn Header="状态" Binding="{Binding TestStatus}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="创建者" Binding="{Binding CreateBy}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
               
             </DataGrid.Columns>

BlankApp1/Model/Dto/SchDtlWithResultModel.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.Dto
+{
+    /// <summary>
+    /// 测试方案明细表 且带有测试结果类
+    /// </summary>
+    public  class SchDtlWithResultModel: BasicPlcTestSchemeDto
+    {
+        public string TestResult { get; set; }
+
+        /// <summary>
+        /// Desc:测试记录明细状态。0：未测试。99：已测试。
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string TestStatus { get; set; }
+    }
+}