diff --git a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java index 5c9c723..69eb2e5 100644 --- a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java +++ b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java @@ -34,6 +34,17 @@ import java.util.Map; public class TestScript { static Logger logger = LoggerFactory.getLogger(TestScript.class); + static class ORDER { + static final int testTakeAllTipStop = 0; + static final int takeTipTestStep = 1; + static final int testTakeAllTip = 2; + static final int testAllLittleBottleBufferPos = 3; + static final int testAllDetectMaterialPos = 4; + static final int testAllBigBottleBufferPos = 5; + static final int pushAllPlateAndDrop = 6; + static final int testSamplePreProcessModule = 7; + } + @Resource A8kCanBusService canBus; @@ -73,12 +84,12 @@ public class TestScript { } } - @EnginnerPageAction(name = "停止测试脚本", group = "控制") + @EnginnerPageAction(name = "停止测试脚本", group = "控制", order = ORDER.testTakeAllTipStop) public void testTakeAllTipStop() { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "取放Tip-单步", group = "Hbot测试脚本") + @EnginnerPageAction(name = "取放Tip-单步", group = "Hbot测试脚本", order = ORDER.takeTipTestStep) public AppRet takeTipTestStep(Integer tipgroup, Integer index) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; @@ -97,7 +108,7 @@ public class TestScript { return ret; } - @EnginnerPageAction(name = "取放Tip-全部", group = "Hbot测试脚本") + @EnginnerPageAction(name = "取放Tip-全部", group = "Hbot测试脚本", order = ORDER.testTakeAllTip) public AppRet> testTakeAllTip(Integer groupId, Integer startFrom) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -119,7 +130,7 @@ public class TestScript { return AppRet.success(result); } - @EnginnerPageAction(name = "测试所有小瓶缓冲液位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有小瓶缓冲液位置", group = "Hbot测试脚本", order = ORDER.testAllLittleBottleBufferPos) public void testAllLittleBottleBufferPos(ConsumableGroup group) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -137,7 +148,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试所有探测物质位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有探测物质位置", group = "Hbot测试脚本", order = ORDER.testAllDetectMaterialPos) public void testAllDetectMaterialPos(ConsumableGroup group) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -154,7 +165,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试所有大瓶缓冲液位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有大瓶缓冲液位置", group = "Hbot测试脚本", order = ORDER.testAllBigBottleBufferPos) public void testAllBigBottleBufferPos() throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -171,7 +182,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "推全部板同时丢弃", group = "板夹移动测试脚本") + @EnginnerPageAction(name = "推全部板同时丢弃", group = "板夹移动测试脚本", order = ORDER.pushAllPlateAndDrop) public void pushAllPlateAndDrop(ConsumableGroup PBCh, IncubatorPos startPos) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; @@ -193,7 +204,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试摇匀模组", group = "摇匀模组测试") + @EnginnerPageAction(name = "测试摇匀模组", group = "摇匀模组测试",order = ORDER.testSamplePreProcessModule) public AppRet testSamplePreProcessModule() throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; diff --git a/zhaohe_app.db b/zhaohe_app.db index cdf383c..9698f32 100644 Binary files a/zhaohe_app.db and b/zhaohe_app.db differ