修改以前的设备名称为设备类型

BlankApp1/BlankApp1/Common/AutoMapper/AutoMapProfile.cs

@@ -29,7 +29,7 @@ namespace BlankApp1.Common.AutoMapper
             CreateMap<bas_plc_test_scheme, BasicPlcTestSchemeDto>()
                 .ForMember(dest => dest.SchemeId, opt => opt.MapFrom(src => src.scheme_id))
                 .ForMember(dest => dest.SchemeName, opt => opt.MapFrom(src => src.scheme_name))
-                .ForMember(dest => dest.DeviceName, opt => opt.MapFrom(src => src.device_name))
+                .ForMember(dest => dest.DeviceKindName, opt => opt.MapFrom(src => src.devicekind_name))
                 .ForMember(dest => dest.CreateBy, opt => opt.MapFrom(src => src.create_by))
                 .ForMember(dest => dest.CreateTime, opt => opt.MapFrom(src => src.create_time))
                 .ForMember(dest => dest.UpdateTime, opt => opt.MapFrom(src => src.update_time))

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddOrEditSchViewModel.cs

@@ -99,7 +99,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             if (bas_Plc_Test_Scheme != null)
                             {
                                 ScheduleName = bas_Plc_Test_Scheme.scheme_name;
-                                DeviceName = bas_Plc_Test_Scheme.device_name;
+                                DeviceKindName = bas_Plc_Test_Scheme.devicekind_name;
 
                             }
                             TestName = findresult.ItemName;
@@ -376,7 +376,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 MessageBox.Show("请填写测试方案名称!", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
             }
-            if (string.IsNullOrEmpty(DeviceName))
+            if (string.IsNullOrEmpty(DeviceKindName))
             {
                 MessageBox.Show("请填写设备名称!", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
@@ -453,7 +453,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         //增加测试方案到数据库
                         BasicPlcTestSchemeDto schDto = new BasicPlcTestSchemeDto();
                         schDto.SchemeName = ScheduleName;
-                        schDto.DeviceName = DeviceName;
+                        schDto.DeviceKindName = DeviceKindName;
                         schDto.CreateBy = Appsession.UserName;
                         schDto.CreateTime = DateTime.Now;
                         schDto.UpdateTime = DateTime.Now;
@@ -471,7 +471,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         if (bas_Plc_Test_Scheme != null)
                         {
                             bas_Plc_Test_Scheme.scheme_name = ScheduleName;
-                            bas_Plc_Test_Scheme.device_name = DeviceName;
+                            bas_Plc_Test_Scheme.devicekind_name = DeviceKindName;
                             _basicPlcTestSchemeService.Edit(bas_Plc_Test_Scheme);
                         }
 
@@ -641,7 +641,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private void ResetMethod(string obj)
         {
             ScheduleName = string.Empty;
-            DeviceName = string.Empty;
+            DeviceKindName = string.Empty;
             TestName = string.Empty;
         }
         #endregion
@@ -691,13 +691,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             set { scheduleName = value; RaisePropertyChanged(); }
         }
         /// <summary>
-        /// 设备名称
+        /// 设备类型
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -66,7 +66,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private void Reset(object obj)
         {
             ScheduleName = string.Empty;
-            DeviceName = string.Empty;
+            DeviceKindName = string.Empty;
             TestName = string.Empty;
             SelectTest = string.Empty;
             StartTime = DateTime.MinValue;
@@ -94,7 +94,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                                       where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                        && (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
                                         && (string.IsNullOrEmpty(TestName) ? true : (a.ItemName == TestName))
-                                         && (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
+                                         && (string.IsNullOrEmpty(DeviceKindName) ? true : (a.DeviceKindName == DeviceKindName))
                                            && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
@@ -273,7 +273,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     BasicPlcTestSchemeDto basicPlcTestSchemeDto = new BasicPlcTestSchemeDto();
                     basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
                     basicPlcTestSchemeDto.SchemeName= sch.SchemeName;
-                    basicPlcTestSchemeDto.DeviceName= sch.DeviceName;
+                    basicPlcTestSchemeDto.DeviceKindName= sch.DeviceKindName;
                     switch(item.item_type)
                     {
                         case 0:
@@ -352,11 +352,11 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/CopySchViewModel.cs

@@ -131,7 +131,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     //增加测试方案到数据库
                     bas_plc_test_scheme schDto = new bas_plc_test_scheme();
                     schDto.scheme_name = ScheduleName;
-                    schDto.device_name = DeviceName;
+                    schDto.devicekind_name = DeviceKindName;
                     schDto.create_by = Appsession.UserName;
                     schDto.create_time = DateTime.Now;
                     schDto.update_time = DateTime.Now;
@@ -214,7 +214,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         if (findSche != null)
                         {
                             //显示设备名称
-                            DeviceName = findSche.device_name;
+                            DeviceKindName = findSche.devicekind_name;
                             long schID = findSche.scheme_id;
                             //查找此方案下的所有的测试项,并增加到表格
                             var schDtls = _basicPlcTestSchemeDtlService.QueryList()?.FindAll(x => x.scheme_id == schID);
@@ -274,11 +274,11 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
 
 

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -163,7 +163,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 if (findSch != null)
                 {
                     ScheduleName = findSch.scheme_name;
-                    DeviceName = findSch.device_name;
+                    DeviceKindName = findSch.devicekind_name;
 
                 }
                 TestName = findresult.ItemName;
@@ -1197,11 +1197,11 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -127,7 +127,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 if (findSch != null)
                 {
                     ScheduleName = findSch.scheme_name;
-                    DeviceName = findSch.device_name;
+                    DeviceKindName = findSch.devicekind_name;
 
                 }
                 TestName = findresult.ItemName;
@@ -1198,11 +1198,11 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -93,7 +93,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 if (findSch != null)
                 {
                     invoiceModel.SchemeName = findSch.scheme_name;
-                    invoiceModel.DeviceName = findSch.device_name;
+                    invoiceModel.DeviceName = findSch.devicekind_name;
 
                 }
                 //此测试方案下的所有测试项
@@ -297,7 +297,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private void Reset(object obj)
         {
             ScheduleName = string.Empty;
-            DeviceName = string.Empty;
+            DeviceKindName = string.Empty;
             TestName = string.Empty;
             SelectTest = string.Empty;
             StartTime = DateTime.MinValue;
@@ -316,7 +316,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 && (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
                                  && (string.IsNullOrEmpty(TestName) ? true : (a.ItemName == TestName))
-                                  && (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
+                                  && (string.IsNullOrEmpty(DeviceKindName) ? true : (a.DeviceKindName == DeviceKindName))
                                     && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
@@ -413,7 +413,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     SchDtlWithResultModel basicPlcTestSchemeDto = new SchDtlWithResultModel();
                     basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
                     basicPlcTestSchemeDto.SchemeName = sch.SchemeName;
-                    basicPlcTestSchemeDto.DeviceName = sch.DeviceName;
+                    basicPlcTestSchemeDto.DeviceKindName = sch.DeviceKindName;
                     switch (item.item_type)
                     {
                         case 0:
@@ -521,11 +521,11 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/TestOperViewModel.cs

@@ -113,7 +113,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private void Reset(object obj)
         {
             ScheduleName = string.Empty;
-            DeviceName = string.Empty;
+            DeviceKindName = string.Empty;
             TestName = string.Empty;
             SelectTest = string.Empty;
             StartTime = DateTime.MinValue;
@@ -138,7 +138,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 && (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
                                  && (string.IsNullOrEmpty(TestName) ? true : (a.ItemName == TestName))
-                                  && (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
+                                  && (string.IsNullOrEmpty(DeviceKindName) ? true : (a.DeviceKindName == DeviceKindName))
                                     && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
@@ -270,7 +270,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     BasicPlcTestSchemeDto basicPlcTestSchemeDto = new BasicPlcTestSchemeDto();
                     basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
                     basicPlcTestSchemeDto.SchemeName = sch.SchemeName;
-                    basicPlcTestSchemeDto.DeviceName = sch.DeviceName;
+                    basicPlcTestSchemeDto.DeviceKindName = sch.DeviceKindName;
                     switch (item.item_type)
                     {
                         case 0:
@@ -353,11 +353,11 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 设备名称
         /// </summary>
-        private string deviceName;
-        public string DeviceName
+        private string deviceKindName;
+        public string DeviceKindName
         {
-            get { return deviceName; }
-            set { deviceName = value; RaisePropertyChanged(); }
+            get { return deviceKindName; }
+            set { deviceKindName = value; RaisePropertyChanged(); }
         }
         /// <summary>
         /// 测试项名称

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/TestResultDetailViewModel.cs

@@ -100,7 +100,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                             if (findSch != null)
                             {
                                 ScheduleName = findSch.scheme_name;
-                                DeviceName = findSch.device_name;
+                                DeviceName = findSch.devicekind_name;
 
                             }
                             TestName = findresult.ItemName;

BlankApp1/BlankApp1/ViewModels/StatisticsViewModel.cs

@@ -80,7 +80,7 @@ namespace BlankApp1.ViewModels
                     SchDtlWithResultModel basicPlcTestSchemeDto = new SchDtlWithResultModel();
                     basicPlcTestSchemeDto.SchemeId = item.scheme_dtl_id;
                     basicPlcTestSchemeDto.SchemeName = sch.SchemeName;
-                    basicPlcTestSchemeDto.DeviceName = sch.DeviceName;
+                    basicPlcTestSchemeDto.DeviceKindName = sch.DeviceKindName;
                     switch (item.item_type)
                     {
                         case 0:

BlankApp1/BlankApp1/Views/BasicConfigView/AddOrEditSchView.xaml

@@ -41,8 +41,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -23,8 +23,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
@@ -67,7 +67,7 @@
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" 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 DeviceKindName}" 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}"/>

BlankApp1/BlankApp1/Views/BasicConfigView/CopySchView.xaml

@@ -16,8 +16,8 @@
             <TextBlock Text="测试方案名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
             <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="160" Text="{Binding DeviceName}"/>
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="160" Text="{Binding DeviceKindName}"/>
             </StackPanel>
             <Button  Content="确认" Width="80"  Margin="5,0"  Command="{Binding SureCommand}" Style="{StaticResource NormalButtonStyle}" />
         </StackPanel>

BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -41,8 +41,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" IsReadOnly="True"  />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}" IsReadOnly="True" />
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>

BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -37,8 +37,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}" IsReadOnly="True" />
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>

BlankApp1/BlankApp1/Views/BusinessManageView/QueryView.xaml

@@ -29,8 +29,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
@@ -71,7 +71,7 @@
             <DataGrid.Columns >
                 <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 DeviceKindName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项类型" Binding="{Binding ItemType}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项名称" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试时间" Binding="{Binding StartTestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" Width="150" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BusinessManageView/TestOperView.xaml

@@ -29,8 +29,8 @@
                 <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBlock Text="设备类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceKindName}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
@@ -70,7 +70,7 @@
             <DataGrid.Columns >
                 <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 DeviceKindName}" 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}"/>

BlankApp1/Model/Dto/BasicPlcTestSchemeDto.cs

@@ -21,11 +21,11 @@ namespace Model.Dto
         /// </summary>
         public string ItemType { get; set; }
         /// <summary>
-        /// Desc:设备名称
+        /// Desc:设备类型名称
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string DeviceName { get; set; }
+        public string DeviceKindName { get; set; }
 
         /// <summary>
         /// Desc:创建者

BlankApp1/Model/Entities/bas_plc_test_scheme.cs

@@ -31,11 +31,11 @@ namespace Model.Entities
            public string scheme_name {get;set;}
 
            /// <summary>
-           /// Desc:设备名称
+           /// Desc:设备类型名称
            /// Default:
            /// Nullable:True
            /// </summary>           
-           public string device_name {get;set;}
+           public string devicekind_name {get;set;}
 
            /// <summary>
            /// Desc:创建者