From 9a0dd8244282d90b08b16d2c239683bbac62fab2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 一月 2024 15:02:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/resources/config.properties |  209 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 200 insertions(+), 9 deletions(-)

diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 25528b8..1c82dd2 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -2,15 +2,15 @@
 # A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
 A01.addresses=DB103.32,DB100.144,DB100.184,DB100.186,DB100.180,DB100.182
 # A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
-A02.addresses=DB103.26,DB100.188,DB100.190,DB100.146
+A02.addresses=DB103.34,DB100.188,DB100.190,DB100.146
 # A01缈昏浆鍦板潃
-A01.flipAddress=DB103.42
+A01.flipAddress=DB106.2
 # A02缈昏浆鍦板潃
-A02.flipAddress=DB103.46
+A02.flipAddress=DB106.14
 # B01缁勫悎涓湴鍧�
-B01.address=DB103.27
+B01.address=DB103.36
 # B02缁勫悎鍦板潃
-B02.address=DB103.29
+B02.address=DB103.40
 # 鎵�鏈夋晠闅滄寜閽湴鍧�
 faultButtonAddresses=DB104.1.4,DB104.1.5,DB104.1.2,DB104.1.3,DB104.1.6,DB104.1.7
 # 澶嶄綅鎸夐挳鍦板潃
@@ -18,7 +18,6 @@
 # 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
 notHomedButtonAddresses=DB104.9.0,DB104.9.1,DB104.9.4,DB104.9.5
 # 杩涚墖id鍦板潃
-
 inputGlassIdAddress=DB100.148
 # 瀛樼墖id鍦板潃
 outputGlassIdAddress=DB100.162
@@ -28,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
@@ -54,4 +53,196 @@
 
 
 
-#PLCManualJog--------------------------
\ No newline at end of file
+
+#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
+
+#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,DB101.11.2,DB101.11.3
+
+Parameter2.timeout=DB100.194
+#褰撳墠鏍煎瓙
+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,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.34,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
+
+
+#-----PlcPositioning1-------------------------
+PlcPositioning1.address=DB100.42
+
+#----------------PlcManualonePosition-----
+
+PlcManualonePosition.addresses=DB100.108,DB100.20,DB103.32
+
+PlcManualonePosition.addresses2=DB100.110,DB100.176,DB103.34
+
+PlcManualonePosition.addresses3=DB100.112,DB100.24,DB103.36
+
+PlcManualonePosition.addresses4=DB100.114,DB100.178,DB103.40
+
+
+#鏁呴殰
+PlcManualonePosition.fault=DB104.1.2,DB104.1.3,DB104.1.6,DB104.1.7
+
+#鏈洖闆�
+PlcManualonePosition.Notzero=DB104.9.4,DB104.9.5,DB104.9.4,DB104.9.5
+
+#鏁呴殰2
+PlcManualonePosition.fault2=DB103.252,DB103.254
+
+#澶嶄綅
+PlcManualonePosition.Reset=DB101.4.0,DB101.4.3,DB101.4.4,DB101.4.6
+#鍥為浂
+PlcManualonePosition.Zero=DB101.4.5,DB101.4.7
+
+
+
+
+
+
+#----------------------------PlcInteractionState
+#杩涚墖
+PlcInteractionState.MESImporttask=DB105.0,DB105.2,DB105.4,DB105.6,DB105.8,DB105.20-33
+
+PlcInteractionState.PLCImporttask=DB106.8,DB106.4,DB106.6,DB106.24,DB106.26-39,DB103.40-57,DB103.58-71
+#鍑虹墖浠诲姟
+PlcInteractionState.MESProductiontask=DB105.10,DB105.12,DB105.14,DB105.16,DB105.18,DB105.34-47
+
+PlcInteractionState.PLCProductiontask=DB106.20,DB106.16,DB106.18,DB103.156-169
+
+#浠诲姟淇℃伅
+PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,DB106.42,DB106.48,DB106.50,DB106.58,DB103.128-141,DB103.142-155,DB103.156-169,DB103.184-197,DB103.212-225
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

--
Gitblit v1.8.0