From 052305ad64458243dada621e526d5a3080a34c67 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 13 十二月 2023 09:27:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/resources/config.properties | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 7d251cb..296a448 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -27,9 +27,9 @@
A02start=DB101.5.1
#A01start
A01start=DB101.5.0
-#A02start
+#A02bstart
A02Bstart=DB101.11.1
-#A01start
+#A01bstart
A01Bstart=DB101.11.0
#abort/resumeTasks
abortresumeTasks=DB101.10.4
@@ -53,4 +53,60 @@
-#PLCManualJog--------------------------
\ No newline at end of file
+#PLCManualJog--------------------------
+
+
+
+#Parameter2--------------------------
+
+#id
+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
+Parameter2.state=DB103.0,DB103.2,DB103.12,DB103.14,DB103.16,DB103.18,DB103.8,DB103.10,DB103.4,DB103.6
+
+
+
+#鎵嬪姩鐘舵��
+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
+
+#PLCManualJog-------------------------------------
+
+#List<String> addressList21 = new ArrayList<>();
+#addressList21.add("DB101.0.0");
+#addressList21.add("DB101.0.1");
+#addressList21.add("DB101.0.2");
+#addressList21.add("DB101.0.3");
+#addressList21.add("DB101.0.4");
+#addressList21.add("DB101.0.5");
+#addressList21.add("DB101.0.6");
+#addressList21.add("DB101.3.4");
+#addressList21.add("DB101.1.4");
+#addressList21.add("DB101.1.2"); //A01 SERVE TURN
+#addressList21.add("DB101.5.2");
+#addressList21.add("DB101.0.7");//A02 VFD conveyor
+#addressList21.add("DB101.3.5");
+#addressList21.add("DB101.1.5");
+#addressList21.add("DB101.1.3");
+#addressList21.add("DB101.5.3");
+#addressList21.add("DB101.1.0");//B01 VFD conveyor
+#addressList21.add("DB101.1.6");
+#addressList21.add("DB101.2.6");
+#addressList21.add("DB101.2.7");
+#addressList21.add("DB101.3.2");
+#
+#addressList21.add("DB101.1.1");//B02 VFD conveyor
+#addressList21.add("DB101.1.7");
+#addressList21.add("DB101.3.0");
+#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
--
Gitblit v1.8.0