添加 id显示

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddOrEditSchViewModel.cs

@@ -113,12 +113,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             foreach (var detail in preconditionModel.DetailInfo)
                             {
                                 BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                                basPlcItemConfigDto.Id=detail.Id;
                                 basPlcItemConfigDto.PlcItem = detail.PlcItem;
                                 basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                                 basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
                                 basPlcItemConfigDto.PlcValue = detail.PlcValue;
                                 basPlcItemConfigDto.Remark = detail.Remark;
-                                beforeConList.Add(basPlcItemConfigDto);
+                                BeforeConList.Add(basPlcItemConfigDto);
                             }
                         }
                           
@@ -134,6 +135,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             foreach (var detail in inModel.DetailInfo)
                             {
                                 BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                                basPlcItemConfigDto.Id = detail.Id;
                                 basPlcItemConfigDto.PlcItem = detail.PlcItem;
                                 basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                                 basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -155,6 +157,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             foreach (var detail in outModel.DetailInfo)
                             {
                                 BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                                basPlcItemConfigDto.Id = detail.Id;
                                 basPlcItemConfigDto.PlcItem = detail.PlcItem;
                                 basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                                 basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -328,10 +331,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     switch (str)
                     {
                         case "Before":
+                            returnValue.Id = BeforeConList.Count + 1;
                             BeforeConList.Add(returnValue); break;
                         case "In":
+                            returnValue.Id = InConList.Count + 1;
                             InConList.Add(returnValue); break;
                         case "Out":
+                            returnValue.Id = OutConList.Count + 1;
                             OutConList.Add(returnValue); break;
                     }
                 }
@@ -591,6 +597,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             foreach (var item in conList)
             {
                 DetailPLC plcItem = new DetailPLC();
+                plcItem.Id = item.Id;
                 plcItem.PlcItem = item.PlcItem;
                 plcItem.PlcAddress = item.PlcAddress;
                 plcItem.PlcAddType = item.PlcAddType;

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -19,6 +19,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Xaml;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
 
 namespace PLCTool.ViewModels.BusinessManageViewModel
 {
@@ -167,6 +168,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in preconditionModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id = detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -188,6 +190,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in inModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id = detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -209,6 +212,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in outModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id = detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -586,7 +590,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private void ReadPredice(string strLogic)
         {
             int countCond = 0;
-            foreach (var item in BeforeConList)
+            foreach (var item in BeforeConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -724,7 +728,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         {
             bool isAction = true;
             int countCond = 0;
-            foreach (var item in InConList)
+            foreach (var item in InConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -873,7 +877,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private async Task ReadJudge(String strLogic)
         {
             int countCond = 0;
-            foreach (var item in OutConList)
+            foreach (var item in OutConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -1032,6 +1036,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             foreach (var item in conList)
             {
                 DetailPLC plcItem = new DetailPLC();
+                plcItem.Id = item.Id;
                 plcItem.PlcItem = item.PlcItem;
                 plcItem.PlcAddress = item.PlcAddress;
                 plcItem.PlcAddType = item.PlcAddType;

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -20,6 +20,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using WPFDevelopers.Controls.Runtimes.Shell32;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
 
 namespace PLCTool.ViewModels.BusinessManageViewModel
 {
@@ -143,6 +144,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in preconditionModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id=detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -164,6 +166,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in inModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id = detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -185,6 +188,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     foreach (var detail in outModel.DetailInfo)
                     {
                         BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto();
+                        basPlcItemConfigDto.Id = detail.Id;
                         basPlcItemConfigDto.PlcItem = detail.PlcItem;
                         basPlcItemConfigDto.PlcAddress = detail.PlcAddress;
                         basPlcItemConfigDto.PlcAddType = detail.PlcAddType;
@@ -574,7 +578,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private void ReadPredice(string  strLogic)
         {
             int countCond = 0;
-            foreach (var item in BeforeConList)
+            foreach (var item in BeforeConList.OrderBy(x=>x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -712,7 +716,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         {
             bool isAction = true;
             int countCond = 0;
-            foreach (var item in InConList)
+            foreach (var item in InConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -882,7 +886,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private async Task ReadJudge(String strLogic)
         {
             int countCond = 0;
-            foreach (var item in OutConList)
+            foreach (var item in OutConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
@@ -1041,6 +1045,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             foreach (var item in conList)
             {
                 DetailPLC plcItem = new DetailPLC();
+                plcItem.Id = item.Id;
                 plcItem.PlcItem = item.PlcItem;
                 plcItem.PlcAddress = item.PlcAddress;
                 plcItem.PlcAddType = item.PlcAddType;

BlankApp1/Model/Dto/JsonModel.cs

@@ -24,7 +24,7 @@ namespace Model.Dto
     }
     public class DetailPLC
     {
-
+        public long Id { get; set; }
 
         public string PlcItem { get; set; }