添加测试方式

BlankApp1/BlankApp1/Common/AutoMapper/AutoMapProfile.cs

@@ -74,6 +74,7 @@ namespace BlankApp1.Common.AutoMapper
                    .ForMember(dest => dest.SchemeDtlId, opt => opt.MapFrom(src => src.scheme_dtl_id))
                      .ForMember(dest => dest.StartTestTime, opt => opt.MapFrom(src => src.start_test_time))
                       .ForMember(dest => dest.FinishTestTime, opt => opt.MapFrom(src => src.finish_test_time))
+                      .ForMember(dest => dest.TestMode, opt => opt.MapFrom(src => src.test_mode))
                        .ForMember(dest => dest.TestResult, opt => opt.MapFrom(src => src.test_result))
                        .ForMember(dest => dest.Status, opt => opt.MapFrom(src => src.status))
                         .ForMember(dest => dest.CreateBy, opt => opt.MapFrom(src => src.create_by))

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -38,6 +38,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private int testStatus = 0;  //测试状态 
         private int testResult = 0; //测试结果
         private long schDetailId = 0; //测试方案明细ID
+
+        private const string TestMode = "自动测试";
         public AutoTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService, IMapper mapper)
         {
             _dialog = dialog;
@@ -219,6 +221,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
                 bizTestRecordDtlDto.StartTestTime = startTime;
                 bizTestRecordDtlDto.FinishTestTime = endTime;
+                bizTestRecordDtlDto.TestMode = TestMode;
                 bizTestRecordDtlDto.Status = testStatus;
                 bizTestRecordDtlDto.TestResult = testResult;
                 bizTestRecordDtlDto.CreateBy = Appsession.UserName;
@@ -236,7 +239,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 findRecordDetail.update_by = Appsession.UserName;
                 findRecordDetail.update_time = DateTime.Now;
                 findRecordDetail.status = testStatus;
-                findRecordDetail.test_result = 99;
+                findRecordDetail.test_result = testResult;
                 _iBizTestRecordDtlService.Edit(findRecordDetail);
             }
         }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -40,6 +40,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private int testStatus = 0;  //测试状态 
         private int testResult = 0; //测试结果
         private long schDetailId = 0; //测试方案明细ID
+
+        private const string TestMode = "手动测试";
         public ManualTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService,IMapper mapper)
         {
             _dialog = dialog;
@@ -223,6 +225,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 
                 bizTestRecordDtlDto.StartTestTime = startTime;
                 bizTestRecordDtlDto.FinishTestTime = endTime;
+                bizTestRecordDtlDto.TestMode = TestMode;
                 bizTestRecordDtlDto.Status = testStatus;
                 bizTestRecordDtlDto.TestResult= testResult;
                 bizTestRecordDtlDto.CreateBy = Appsession.UserName;

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -46,8 +46,6 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             QueryCommand = new DelegateCommand<object>(Query);
             ResetCommand = new DelegateCommand<object>(Reset);
             ExportCommand = new DelegateCommand<string>(Export);
-  
-
             GetConfigOption();
             GetContent();
         }

BlankApp1/Model/Dto/BizTestRecordDtlDto.cs

@@ -38,6 +38,11 @@ namespace Model.Dto
         /// </summary>           
         public DateTime? FinishTestTime { get; set; }
 
+
+        /// <summary>
+        /// 测试模式
+        /// </summary>
+        public string TestMode { get; set; }
         /// <summary>
         /// Desc:测试项结果。0：NO 不通过；1：YES 通过
         /// Default:

BlankApp1/Model/Entities/biz_test_record_dtl.cs

@@ -50,13 +50,16 @@ namespace Model.Entities
            /// Nullable:True
            /// </summary>           
            public DateTime? finish_test_time {get;set;}
-
-           /// <summary>
-           /// Desc:测试项结果。0：NO 不通过；1：YES 通过
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? test_result {get;set;}
+          /// <summary>
+          /// 测试模式
+          /// </summary>
+           public string test_mode { get; set; }
+        /// <summary>
+        /// Desc:测试项结果。0：NO 不通过；1：YES 通过
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? test_result {get;set;}
 
            /// <summary>
            /// Desc:测试记录明细状态。0：未测试。99：已测试。