From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 557afd9..f55ea2f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -6,13 +6,22 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PLCManualJog;
 import com.example.springboot.component.PlcHold;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
 import com.example.springboot.component.PlcParameter;
 import com.example.springboot.component.Plcaction;
 import com.example.springboot.component.Plchome;
 import com.example.springboot.component.Plcalarm;
 import com.example.springboot.component.Plcsign;
 import com.example.springboot.component.Plcstate;
+import com.example.springboot.component.PlcPositioning1;
+import com.example.springboot.component.PlcPositioning2;
+import com.example.springboot.component.PlcParameter2;
+import com.example.springboot.component.PlcParameter1;
+import com.example.springboot.component.PlcServoManualone;
 
 @Component
 @Order(1)
@@ -25,18 +34,27 @@
     //
     System.out.println("鍚姩瀹屾垚");
 
-    new PlcHold().start();
+     new PlcHold().start();
 
-    // new Plcaction().start();
-
+    new Plcaction().start();
+    //
     new Plchome().start();
-
+    //
     new PlcParameter().start();
-
-    new Plcalarm().start();
-
+    //
+    // new Plcalarm().start();
+    //
     new Plcsign().start();
-
-    new Plcstate().start();
+    //
+    // new Plcstate().start();
+    // new PlcPositioning1().start();
+    // new PlcPositioning2().start();
+    // new PlcParameter2().start();
+    // new PlcParameter1().start();
+    // new PLCAutomaticParameterSetting().start();
+    // new PlcServoManualone().start();
+    // new PLCManualJog().start();
+    // new PlcManualonePosition().start();
+    new PlcManualonePosition2().start();
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0