Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-05-11 7dfc5501decb84bce7fe0563956eae705844a2f2

 springboot-vue3/src/main/resources/config.properties

@@ -137,10 +137,10 @@
#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

PLCManualJog.button=DB101.0.0,DB101.0.1,DB101.0.2,DB101.0.3,DB101.0.4,DB101.0.5,DB101.1.4,DB101.1.2,DB101.0.6,DB101.5.2,DB101.1.5,DB101.1.3,DB101.0.7,DB101.5.3,DB101.1.6,DB101.2.6,DB101.2.7,DB101.1.0,DB101.3.2,DB101.1.7,DB101.3.0,DB101.3.1,DB101.1.1,DB101.3.3







PLCOriginmarking=DB101.10.5,DB101.10.6

#AUto----------------------------------------------------------------

#List<String> addresses = new ArrayList<>();

#addresses.add("DB100.0");

@@ -155,7 +155,7 @@
#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

Auto.addresses=DB100.2,DB100.4,DB100.6,DB100.28,DB100.30,DB100.32,DB100.36,DB100.38,DB100.40



#List<String> waddresses1 = new ArrayList<>();

#waddresses1.add("DB100.0");

@@ -171,7 +171,7 @@
#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

Auto.shusong=DB100.2,DB100.4,DB100.6,DB100.28,DB100.30,DB100.32,DB100.36,DB100.38,DB100.40





#-----PlcPositioning1-------------------------

@@ -215,13 +215,13 @@
#出片任务

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.PLCProductiontask=DB106.20,DB106.16,DB106.18,DB103.156-169,DB106.64



#任务信息

PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,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

PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,DB105.48,DB105.50,DB106.42,DB106.48







#任务信息2

PlcInteractionState.MEStaskinformation2=DB106.52,DB106.58,DB103.128-141,DB103.142-155,DB103.156-169,DB103.184-197,DB103.212-225