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

wuyouming666

2024-05-29 75375a0f68c8b91799482dc1cd2ec7d7f211167f

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

@@ -36,11 +36,11 @@
      // 根据玻璃id获取订单号,单独数据源
      
      // try {
      //   //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
      //   north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
      //   spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
      // } catch (SQLException e) {
      //   // TODO Auto-generated catch block
      //   spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X22670914802GV","",""));
        //north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
        //spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
      //} catch (SQLException e) {
        // TODO Auto-generated catch block
      //   e.printStackTrace();
      // }
      //        spianService.selectout2("X21942610602GV");
@@ -167,13 +167,14 @@
      north_glass_buffer1 glass2 =new north_glass_buffer1();

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