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

ZengTao

2024-05-09 63574bf6cf94613385cb8d0e2c2beb1829f644b5

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

@@ -62,10 +62,12 @@
    // b.put()

    @Override

    public void run() {

                
        while (this != null) {

            Short zhi = 0;

            JSONObject jsonObject = new JSONObject();

            jsonObject.append("feedglassid", feedglassid);

            
            try {

                Thread.sleep(1000);

                // 注入mapper

@@ -203,10 +205,10 @@
                            e.printStackTrace();

                        }

                        Short send;

                        if (position.equals("0")) {

                            send = 2;

                        } else {

                        if (position.equals("1")) {

                            send = 1;

                        } else {

                            send = 2;

                        }

                        if (J01id != null) {

                            int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态