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

wuyouming666

2024-01-05 e67b38c4ed42d78a0ab8235f1adcb7eefc011631

 springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java

@@ -64,7 +64,7 @@
            addresses.add("DB100.116");

            addresses.add("DB100.16");



            addresses.add("DB103.20");

            addresses.add("DB106.2");

            List<Short> arraylist = S7control.getinstance().readWords(addresses);

            // System.out.println(arraylist);



@@ -72,7 +72,7 @@
            addresses2.add("DB100.118");

            addresses2.add("DB100.192");



            addresses2.add("DB103.22");

            addresses2.add("DB106.14");

            List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);



            List<String> addresses9 = new ArrayList<>();

@@ -179,18 +179,14 @@
                            // A01下发

                            customS7Control.WriteWordToPLC(messageArray, waddresses1, 0);





                            // A02下发

                            customS7Control.WriteWordToPLC(messageArray, waddresses2, 1);





                            // 写入故障地址

                            customS7Control.WriteWordToPLC(messageArray, waddresses3, 2);





                            // 写入复位地址

                            customS7Control.writeBitToPLC(messageArray, waddresses4, 3);





                            // 写入回零地址

                            customS7Control.writeBitToPLC(messageArray, waddresses5, 4);