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

ZengTao

2024-05-08 9472449b4ca46f482d13b6e628660c61101b443f

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

@@ -167,13 +167,14 @@
      north_glass_buffer1 glass2 =new north_glass_buffer1();

      try {
        if(Plchome.dbconnected==true){
        if(queueid1.toString()!=""){
          glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01玻璃信息
        }
        if(queueid2.toString()!=""){
          glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02玻璃信息
        }
        
        }
      } catch (SQLException e) {
        e.printStackTrace();
      }