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

wuyouming666

2024-01-05 e67b38c4ed42d78a0ab8235f1adcb7eefc011631

 springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java

@@ -10,7 +10,6 @@

import org.springframework.stereotype.Component;

import com.example.springboot.entity.Glass;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.north_glass_buffer1;
@Component
@@ -100,6 +99,9 @@
         return queue;
    }

	

   //根据玻璃id，订单id，铝框id查询客户玻璃信息
   public  List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIds(String glassid,String orderid,String frameid) throws SQLException {
        conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
@@ -136,7 +138,42 @@
         return glass;
    }

	
   //根据铝框id查询客户玻璃信息
   public  List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIdss(String frameid) throws SQLException {
        conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
      List<north_glass_buffer1> glass=new ArrayList<north_glass_buffer1>();
        String sql = "select * from north_glass_buffer1 where FrameBarcode=?";
         ps = conn.prepareStatement(sql);
       ps.setString(1, frameid);
         rs= ps.executeQuery();
         while (rs.next()) {
         north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();

         north_glass_buffer1s.setId(rs.getInt("Id"));
         north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
         north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
         north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
         north_glass_buffer1s.setbarcode(rs.getString("barcode"));
         north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
         north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
         north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
         north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
         north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
         north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
         north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
         north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
         north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));


         glass.add(north_glass_buffer1s);
			
         }
      //  conn.close();
         return glass;
    }

   //根据铝框id查询l铝框是否翻转
   public String SelectFlipByFrameBarcode(String frameBarcode) throws SQLException {
      conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
@@ -152,6 +189,21 @@
      //  conn.close();
         return flip;
   }
   //根据铝框id查询是否铝框摆放
   public String SelectPositionByFrameBarcode(String frameBarcode) throws SQLException {
          conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
      String position="";
        String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
         ps = conn.prepareStatement(sql1);
       ps.setString(1, frameBarcode);
         rs= ps.executeQuery();
         while (rs.next()) {
         position=rs.getString("position");
         }
      //  conn.close();
         return position;
    }
   
   /**
    * 1. 加载驱动
@@ -184,6 +236,8 @@
      }
   }

    



}