修改序号

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -336,6 +336,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// </summary>
         private void GetContent()
         {
+            int count = 0;
             //所有测试方案
             var schlist = _basicPlcTestSchemeService.QueryList();
             var configList = _mapper.Map<List<bas_plc_test_scheme>, List<BasicPlcTestSchemeDto>>(schlist);
@@ -346,16 +347,15 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             //查找测试项名称
             foreach (var sch in configList)
             {
-               
-
+                count++;
+                sch.DisId = count;
                 allConfigList.Add(sch);
                 conditionConfig.Add(sch);
 
-                conditionConfig = conditionConfig.OrderBy(x => x.DeviceKindName).ThenBy(x => x.SchemeId).ToList();
-                //默认显示的第一页
-                Getpage();
             }
-          
+            conditionConfig = conditionConfig.OrderBy(x => x.DisId).ThenBy(x => x.DeviceKindName).ToList();
+            //默认显示的第一页
+            Getpage();
         }
 
         /// <summary>

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceKindViewModel.cs

@@ -286,14 +286,17 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// </summary>
         private void GetPprojectConfig()
         {
+            int count = 0;
             allDeviceKindList.Clear();
             conditionDeviceKind.Clear();
             var projectlist = _iBasicDeviceKindService.QueryList();
             var allDeviceKinds = _mapper.Map<List<bas_device_kind>, List<BasDeviceKindDto>>(projectlist);
-            foreach (var plc in allDeviceKinds)
+            foreach (var kind in allDeviceKinds)
             {
-                allDeviceKindList.Add(plc);
-                conditionDeviceKind.Add(plc);
+                count++;
+                kind.DisId = count;
+                allDeviceKindList.Add(kind);
+                conditionDeviceKind.Add(kind);
             }
             conditionDeviceKind = conditionDeviceKind.OrderBy(x => x.DeviceKindId).ToList();
             Getpage();

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceViewModel.cs

@@ -313,6 +313,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// </summary>
         private void GetPprojectConfig()
         {
+            int count = 0;
             allDeviceList.Clear();
             conditionDevices.Clear();
             var projectlist = _iBasicDeviceService.QueryList();
@@ -322,7 +323,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 //获取项目名和设备类型
                 kind.DeviceKindName = _iBasicDeviceKindService.Find((int)kind.DeviceKindId)?.devicekind_name;
                 kind.ProjectName = _iBasicProjectService.Find((int)kind.ProjectId)?.project_name;
-
+                count++;
+                kind.DisId = count;
                 allDeviceList.Add(kind);
                 conditionDevices.Add(kind);
             }

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/PLCConfigViewModel.cs

@@ -228,16 +228,19 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// </summary>
         private void GetPLCConfig()
         {
+            int count = 0;
             allPLCConfigList.Clear();
             conditionConfig.Clear();
             var plclist = _iBasPlcItemConfigService.QueryList();
             var allPlc = _mapper.Map<List<bas_plc_item_config>, List<BasPlcItemConfigDto>>(plclist);
             foreach (var plc in allPlc)
             {
-                    allPLCConfigList.Add(plc);
-                    conditionConfig.Add(plc);
+                count++;
+                plc.DisId = count;
+                allPLCConfigList.Add(plc);
+                conditionConfig.Add(plc);
             }
-            conditionConfig = conditionConfig.OrderBy(x => x.Id).ToList();
+            conditionConfig = conditionConfig.OrderBy(x => x.DisId).ToList();
             Getpage();
         }
         /// <summary>

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/ProjectViewModel.cs

@@ -272,12 +272,15 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// </summary>
         private void GetPprojectConfig()
         {
+            int count = 0;
             allProjectList.Clear();
             conditionProject.Clear();
             var projectlist = _iBasicProjectService.QueryList();
             var allPlc = _mapper.Map<List<bas_project>, List<BasProjectDto>>(projectlist);
             foreach (var plc in allPlc)
             {
+                count++;
+                plc.DisId= count;
                 allProjectList.Add(plc);
                 conditionProject.Add(plc);
             }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/DeviceTestViewModel.cs

@@ -113,10 +113,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <param name="obj"></param>
         private void DgSelect(object obj)
         {
+            int count = 0;
             BasDeviceWithSchModel dtlSch = (BasDeviceWithSchModel)obj;
+            
             if(dtlSch != null)
             {
-                SchItemList = new ObservableCollection<BasDeviceWithSchModel>(allDeviceAndSchList.FindAll(x => ((x.ProjectName == dtlSch.ProjectName) && (x.DeviceName == dtlSch.DeviceName))));
+                var schs = allDeviceAndSchList.FindAll(x => ((x.ProjectName == dtlSch.ProjectName) && (x.DeviceName == dtlSch.DeviceName)));
+                foreach(var sch in schs)
+                {
+                    if(sch!=null)
+                    {
+                        count++;
+                        sch.DisId = count;
+                    }
+                }
+                SchItemList = new ObservableCollection<BasDeviceWithSchModel>(schs);
             }
           
         }
@@ -306,7 +317,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             var schDtoList = _mapper.Map<List<bas_plc_test_scheme>, List<BasicPlcTestSchemeDto>>(schlist);
             try
             {
-
+                int count = 0;
                 foreach (var item in allDeviceKinds)
                 {
 
@@ -318,6 +329,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     string deviceKind = _iBasicDeviceKindService.Find((int)item.DeviceKindId)?.devicekind_name;
                     //在测试方案中查找此设备类型的所有方案
                     var schs = schDtoList.FindAll(x => x.DeviceKindName == deviceKind);
+                   
                     //设备方案
                     foreach (var sch in schs)
                     {
@@ -351,11 +363,14 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     {
                         totalTestStu = "已测试";
                     }
+                    
                     //只添加选择的项目
                     if (projectName == selectProjectName)
                     {
+                        count++;
                         allDeviceList.Add(new BasDeviceWithSchModel()
-                        {
+                        {   
+                            DisId=count,
                             DeviceId = item.DeviceId,
                             DeviceNo = item.DeviceNo,
                             DeviceName = item.DeviceName,
@@ -368,6 +383,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         });
                         conditionDevices.Add(new BasDeviceWithSchModel()
                         {
+                            DisId = count,
                             DeviceId = item.DeviceId,
                             DeviceNo = item.DeviceNo,
                             DeviceName = item.DeviceName,
@@ -382,7 +398,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
 
                 }
-                conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();
+                conditionDevices = conditionDevices.OrderBy(x => x.DisId).ToList();
                 Getpage();
             }
             catch(Exception ex)

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -70,7 +70,7 @@
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
                  ItemsSource="{Binding BaseConfigList}"    >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备类型" Binding="{Binding DeviceKindName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                

BlankApp1/BlankApp1/Views/BasicConfigView/DeviceKindView.xaml

@@ -67,7 +67,7 @@
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
                  ItemsSource="{Binding DeviceKindItemList}" >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceKindId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="设备类型编号" Binding="{Binding DeviceKindNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备类型名称" Binding="{Binding DeviceKindName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BasicConfigView/DeviceView.xaml

@@ -72,7 +72,7 @@
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
                  ItemsSource="{Binding DeviceItemList}"  >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="设备编号" Binding="{Binding DeviceNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="所属项目编号" Binding="{Binding ProjectName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BasicConfigView/PLCConfigView.xaml

@@ -47,7 +47,7 @@
         ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
         ItemsSource="{Binding PLCItemList}" >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BasicConfigView/ProjectView.xaml

@@ -77,7 +77,7 @@
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
                  ItemsSource="{Binding ProjectItemList}"   >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding ProjectId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="项目编号" Binding="{Binding ProjectNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="项目名称" Binding="{Binding ProjectName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="负责人" Binding="{Binding ProjectLeader}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestView.xaml

@@ -89,7 +89,7 @@
                 </b:EventTrigger>
             </b:Interaction.Triggers>
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="设备编号" Binding="{Binding DeviceNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备类型" Binding="{Binding DeviceKindName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
@@ -125,7 +125,7 @@
            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
           ItemsSource="{Binding SchItemList}" >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DisId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
               
                 <DataGridTextColumn Header="设备类型" Binding="{Binding DeviceKindName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/Model/Dto/BasDeviceDto.cs

@@ -8,6 +8,12 @@ namespace Model.Dto
 {
     public  class BasDeviceDto : BaseDto
     {
+        private int disId { get; set; }
+        public int DisId
+        {
+            get { return disId; }
+            set { disId = value; OnPropertyChanged(); }
+        }
         /// <summary>
         /// Desc:设备主键ID
         /// Default:

BlankApp1/Model/Dto/BasDeviceKindDto.cs

@@ -8,6 +8,12 @@ namespace Model.Dto
 {
     public  class BasDeviceKindDto : BaseDto
     {
+        private int disId { get; set; }
+        public int DisId
+        {
+            get { return disId; }
+            set { disId = value; OnPropertyChanged(); }
+        }
         /// <summary>
         /// Desc:设备类型主键ID
         /// Default:

BlankApp1/Model/Dto/BasDeviceKindWithSchModel.cs

@@ -11,6 +11,7 @@ namespace Model.Dto
     /// </summary>
     public  class BasDeviceWithSchModel:BasDeviceDto
     {
+        public int DisId { get; set; }
         /// <summary>
         /// 测试方案名称
         /// </summary>

BlankApp1/Model/Dto/BasPlcItemConfigDto.cs

@@ -9,6 +9,7 @@ namespace Model.Dto
 {
     public  class BasPlcItemConfigDto:BaseDto
     {
+        public int DisId { get; set; }
         public long Id { get; set; }
 
         /// <summary>

BlankApp1/Model/Dto/BasProjectDto.cs

@@ -8,6 +8,12 @@ namespace Model.Dto
 {
     public  class BasProjectDto:BaseDto
     {
+        private int disId { get; set; } 
+        public int DisId
+        {
+            get { return disId; }
+            set { disId = value; OnPropertyChanged(); }
+        }
         private long projectId { get; set; }
         public long ProjectId
         {

BlankApp1/Model/Dto/BasicPlcTestSchemeDto.cs

@@ -8,6 +8,7 @@ namespace Model.Dto
 {
     public  class BasicPlcTestSchemeDto
     {
+        public int DisId { get; set; }
         public long SchemeId { get; set; }
         public string SchemeName { get; set; }