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

严智鑫

2024-05-29 ad7f461a110cd30ae219bcaa977bbeb0c8409599

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

@@ -61,6 +61,7 @@
      }
    }
      //进片请求时
      
      GlassInfo glass=albaniaMapper.SelectGlass();
      if(PLCToMES!=null && glass!=null&&MESToPLC!=null){
      if(PLCToMES.equals("1")==true&&MESToPLC.equals("0")==true){