From 37f7f87968cfd2c400283fbf83851c39c2c4d456 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 十二月 2023 08:12:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/resources/config.properties | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 296a448..1037320 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -53,28 +53,54 @@
-#PLCManualJog--------------------------
-
-
#Parameter2--------------------------
#id
+#addressList1.add("DB103.44");//D01
+#addressList1.add("DB103.58");//D02
+#addressList1.add("DB103.72");//D03
+#addressList1.add("DB103.86");//D04
+#addressList1.add("DB103.100");//D05
+#addressList1.add("DB103.114");//D06
+#addressList1.add("DB103.128");//A01
+#addressList1.add("DB103.142");//A01 2
+#addressList1.add("DB103.156");//A02
+#addressList1.add("DB103.184");//B01
+#addressList1.add("DB103.212");//B02
Parameter2.id=DB103.44,DB103.58,DB103.72,DB103.86,DB103.100,DB103.114,DB103.128,DB103.142,DB103.156,DB103.184,DB103.212
-#娓呴櫎id
+#state
+#addresses.add("DB103.0");
+#addresses.add("DB103.2");
+#addresses.add("DB103.12");
+#addresses.add("DB103.14");
+#addresses.add("DB103.16");
+#addresses.add("DB103.18");
+#addresses.add("DB103.8");
+#addresses.add("DB103.10");
+#addresses.add("DB103.4");
+#addresses.add("DB103.6");
Parameter2.state=DB103.0,DB103.2,DB103.12,DB103.14,DB103.16,DB103.18,DB103.8,DB103.10,DB103.4,DB103.6
+#娓呴櫎id
-
-#鎵嬪姩鐘舵��
+#addressList0.add("DB101.9.2");
+#addressList0.add("DB101.9.3");
+#addressList0.add("DB101.9.4");
+#addressList0.add("DB101.9.5");
+#addressList0.add("DB101.9.6");
+#addressList0.add("DB101.9.7");
+#
+#addressList0.add("DB101.10.0");
+#addressList0.add("DB101.10.1");
+#addressList0.add("DB101.10.2");
+#addressList0.add("DB101.10.3");
Parameter2.cleanid=DB101.9.2,DB101.9.3,DB101.9.4,DB101.9.5,DB101.9.6,DB101.9.7,DB101.10.0,DB101.10.1,DB101.10.2,DB101.10.3
#鎵爜鏋�
Parameter2.scanner=DB103.256,DB103.270
-
#鎬ュ仠
Parameter2.stop=DB101.10.4
-
#褰撳墠鏍煎瓙
Parameter2.Currentcell=DB103.32,DB103.34,DB103.36,DB103.40
@@ -109,4 +135,38 @@
#addressList21.add("DB101.3.1");
#addressList21.add("DB101.3.3");
#鎸夐挳
-PLCManualJog.button=DB101.0.0,DB101.0.1,DB101.0.2,DB101.0.3,DB101.0.4,DB101.0.5,DB101.0.6,DB101.3.4,DB101.1.4,DB101.1.2,DB101.5.2,DB101.0.7,DB101.3.5,DB101.1.5,DB101.1.3,DB101.5.3,DB101.1.0,DB101.1.6,DB101.2.6,DB101.2.7,DB101.3.2,DB101.1.1,DB101.1.7,DB101.3.0,DB101.3.1,DB101.3.3
+PLCManualJog.button=DB101.0.0,DB101.0.1,DB101.0.2,DB101.0.3,DB101.0.4,DB101.0.5,DB101.0.6,DB101.3.4,DB101.1.4,DB101.1.2,DB101.5.2,DB101.0.7,DB101.3.5,DB101.1.5,DB101.1.3,DB101.5.3,DB101.1.0,DB101.1.6,DB101.2.6,DB101.2.7,DB101.3.2,DB101.1.1,DB101.1.7,DB101.3.0,DB101.3.1,DB101.3.3,DB101.10.5,DB101.10.6
+
+
+
+#AUto----------------------------------------------------------------
+#List<String> addresses = new ArrayList<>();
+#addresses.add("DB100.0");
+#addresses.add("DB100.2");
+#addresses.add("DB100.4");
+#addresses.add("DB100.6");
+#addresses.add("DB100.26");
+#addresses.add("DB100.28");
+#addresses.add("DB100.30");
+#addresses.add("DB100.32");
+#addresses.add("DB100.34");
+#addresses.add("DB100.36");
+#addresses.add("DB100.38");
+#addresses.add("DB100.40");
+Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.36,DB100.38,DB100.40
+
+#List<String> waddresses1 = new ArrayList<>();
+#waddresses1.add("DB100.0");
+#waddresses1.add("DB100.2");
+#waddresses1.add("DB100.4");
+#waddresses1.add("DB100.6");
+#waddresses1.add("DB100.26");
+#waddresses1.add("DB100.28");
+#waddresses1.add("DB100.30");
+#waddresses1.add("DB100.32");
+#waddresses1.add("DB100.34");
+#waddresses1.add("DB100.36");
+#waddresses1.add("DB100.38");
+#waddresses1.add("DB100.40");
+
+Auto.shusong=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
\ No newline at end of file
--
Gitblit v1.8.0