Merge remote-tracking branch 'origin/master'

wu

2024-05-10 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java

@@ -8,7 +8,7 @@
import java.util.ArrayList;
import java.util.List;

import static com.mes.tools.InitUtil.readAndUpdateWordValues;
//import static com.mes.tools.InitUtil.readAndUpdateWordValues;

public class PLCAutoMes extends Thread {

@@ -61,7 +61,7 @@
            // System.out.println(jsonFilePath);

            // readAndUpdateWordValues(PlcReadObject);
            readAndUpdateWordValues(PlcMesObject);
            //readAndUpdateWordValues(PlcMesObject);

            List<String> addresses = new ArrayList<>();
            addresses.add("FeedID");