现场优化5

2026-08-15 23:28:19 +08:00
parent 92eab2f626
commit 2bb8313f99
10 changed files with 4149 additions and 43 deletions
@@ -255,6 +255,7 @@ namespace UIShare
                tmpParameters.Clear();
                TestRoundID = Guid.NewGuid();
            }
+            int initialLoopStackCount = loopStack.Count;
            foreach (var item in program.Parameters)
            {
                tmpParameters.TryAdd(item.ID, item);
@@ -435,7 +436,12 @@ namespace UIShare
                    await SaveStepRecordAsync(step, depth, false);
                }
            }
+            bool finalResult = loopStack.Count == initialLoopStackCount && stepSuccess;

+            if (depth > 0) // 子程序
+            {
+                return finalResult;
+            }
            return loopStack.Count == 0 && stepSuccess;
        }

@@ -51,28 +51,20 @@ namespace UIShare.GlobalVariable
                Name = "台架序号",
                Value = 1,
                IsEditable=false
-            },
-             new ParameterVM
-            {
-                Category = ParameterCategory.Input,
-                Type = typeof(int),
-                Name = "直流负载通道",
-                Value = 1,
-                IsEditable=false
-            },
-              new ParameterVM
-            {
-                Category = ParameterCategory.Input,
-                Type = typeof(int),
-                Name = "交流电源通道",
-                Value = 1,
-                IsEditable=false
            },
            new ParameterVM
            {
                Category = ParameterCategory.Input,
                Type = typeof(int),
-                Name = "CAN通道",
+                Name = "CAN通道1",
+                Value = 0,
+                IsEditable=false
+            },
+               new ParameterVM
+            {
+                Category = ParameterCategory.Input,
+                Type = typeof(int),
+                Name = "CAN通道2",
                Value = 0,
                IsEditable=false
            },