diff --git a/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/GZXQHandler.java b/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/GZXQHandler.java
index 7154f1d..5da2a20 100644
--- a/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/GZXQHandler.java
+++ b/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/GZXQHandler.java
@@ -37,7 +37,7 @@ public class GZXQHandler extends AbstractHandler{
 	                 newJFrame.setTitle("工装需求查询");
 	                // this.getContentPane().setBackground(Color.red);
 	                 newJFrame.getContentPane().setBackground(new java.awt.Color(255, 255, 255));
-	                 newJFrame.setSize(950, height2);  // 设置Frame的大小
+	                 newJFrame.setSize(1240, height2);  // 设置Frame的大小
 	                 newJFrame.setLocation(x, y);  // 设置Frame的位置
 	                 newJFrame.setResizable(false);
 	                 newJFrame.setDefaultCloseOperation(2);  // 设置窗口关闭时的默认操作
diff --git a/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/NewJFrame.java b/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/NewJFrame.java
index d6e9a2f..07890f5 100644
--- a/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/NewJFrame.java
+++ b/com.connor.chint.wuhan/src/com/connor/plm/GZXQ/NewJFrame.java
@@ -16,14 +16,18 @@ import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.LayoutStyle;
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumnModel;
 
+import com.chint.plm.SearchSapResult9.SumTableBean;
+import com.connor.chint.sap2.util.SAPUtil;
 import com.connor.chint.sap2.util.SqlUtil;
 import com.connor.plm.CostListManagement.pojo.GzxqBean;
 import com.teamcenter.rac.kernel.TCComponent;
+import com.teamcenter.rac.kernel.TCException;
 import com.teamcenter.rac.kernel.TCSession;
 import com.teamcenter.rac.util.MessageBox;
 
@@ -34,6 +38,61 @@ import com.teamcenter.rac.util.MessageBox;
 public class NewJFrame extends javax.swing.JFrame {
 
 
+	//分页
+	 private int pageNum;//分页显示当前第几页
+	    private List<List<GzxqBean>> tableBeans = new ArrayList<List<GzxqBean>>();
+	    private DefaultTableModel model;
+	    
+	    
+	    // Variables declaration - do not modify  
+	    private javax.swing.JButton sy;
+	    private javax.swing.JButton syy;
+	    private javax.swing.JButton xyy;
+	    private javax.swing.JButton wy;
+	    
+	    
+	    private javax.swing.JButton jButton1;
+	    private javax.swing.JButton jButton2;
+	    private javax.swing.JLabel jLabel1;
+	    private javax.swing.JLabel jLabel10;
+	    private javax.swing.JLabel jLabel11;
+	    private javax.swing.JLabel jLabel12;
+	    private javax.swing.JLabel jLabel13;
+	    private javax.swing.JLabel jLabel14;
+	    private javax.swing.JLabel jLabel15;
+	    private javax.swing.JLabel jLabel2;
+	    private javax.swing.JLabel jLabel3;
+	    private javax.swing.JLabel jLabel4;
+	    private javax.swing.JLabel jLabel5;
+	    private javax.swing.JLabel jLabel6;
+	    private javax.swing.JLabel jLabel7;
+	    private javax.swing.JLabel jLabel8;
+	    private javax.swing.JLabel jLabel9;
+	    private javax.swing.JPanel jPanel1;
+	    private javax.swing.JPanel jPanel2;
+	    private javax.swing.JPanel jPanel3;
+	    private javax.swing.JScrollPane jScrollPane2;
+	    private javax.swing.JScrollPane jScrollPane3;
+	    private javax.swing.JScrollPane jScrollPane4;
+	    private javax.swing.JTable jTable1;
+	    private javax.swing.JTable jTable2;
+	    private javax.swing.JTable jTable3;
+	    private javax.swing.JTextField jTextField1;
+	    private javax.swing.JTextField jTextField10;
+	    private javax.swing.JTextField jTextField11;
+	    private javax.swing.JTextField jTextField12;
+	    private javax.swing.JTextField jTextField13;
+	    private javax.swing.JTextField jTextField14;
+	    private javax.swing.JTextField jTextField2;
+	    private javax.swing.JTextField jTextField3;
+	    private javax.swing.JTextField jTextField4;
+	    private javax.swing.JTextField jTextField5;
+	    private javax.swing.JTextField jTextField6;
+	    private javax.swing.JTextField jTextField7;
+	    private javax.swing.JTextField jTextField8;
+	    private javax.swing.JTextField jTextField9;
+	    // End of variables declaration            
+	    
 	private TCSession session;
 	private Connection conn;
 	private TCComponent f;
@@ -64,6 +123,7 @@ public class NewJFrame extends javax.swing.JFrame {
 
         jScrollPane2 = new javax.swing.JScrollPane();
         jTable1 = new javax.swing.JTable();
+        jTable3 = new javax.swing.JTable();
         jPanel1 = new javax.swing.JPanel();
         jLabel2 = new javax.swing.JLabel();
         jTextField1 = new javax.swing.JTextField();
@@ -99,8 +159,80 @@ public class NewJFrame extends javax.swing.JFrame {
         jLabel1 = new javax.swing.JLabel();
         jPanel2 = new javax.swing.JPanel();
         jScrollPane3 = new javax.swing.JScrollPane();
+        jPanel3 = new javax.swing.JPanel();
+        jScrollPane4 = new javax.swing.JScrollPane();
         jTable2 = new javax.swing.JTable();
 
+        //分页
+        sy = new javax.swing.JButton();
+        syy = new javax.swing.JButton();
+        xyy = new javax.swing.JButton();
+        wy = new javax.swing.JButton();
+        
+sy.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent var1) {
+				// TODO Auto-generated method stub
+				pageNum = 0;
+				model.setRowCount(0);//清空数据
+				for (int j = 0; j < tableBeans.get(0).size(); j++) {
+					GzxqBean quotation = tableBeans.get(0).get(j);
+					String[] row = {j+1+"",quotation.getSfId(),quotation.getInstanceId(),quotation.getHead(),quotation.getScheduledtime(),quotation.getReason(),quotation.getJsgyrequirements(),"打开","设计",quotation.getState()};
+					model.addRow(row);
+				}
+				
+			}
+		});
+
+syy.addActionListener(new ActionListener() {
+	
+	@Override
+	public void actionPerformed(ActionEvent var1) {
+		// TODO Auto-generated method stub
+		if(pageNum>0) {
+    		pageNum = pageNum -1;
+    	}
+		model.setRowCount(0);//清空数据
+		for (int j = 0; j < tableBeans.get(pageNum).size(); j++) {
+			GzxqBean quotation = tableBeans.get(pageNum).get(j);
+			String[] row = {pageNum*10+j+1+"",quotation.getSfId(),quotation.getInstanceId(),quotation.getHead(),quotation.getScheduledtime(),quotation.getReason(),quotation.getJsgyrequirements(),"打开","设计",quotation.getState()};
+			model.addRow(row);
+		}
+	}
+});
+
+xyy.addActionListener(new ActionListener() {
+	
+	@Override
+	public void actionPerformed(ActionEvent var1) {
+		// TODO Auto-generated method stub
+		if(pageNum<tableBeans.size()-1) {
+    		pageNum = pageNum + 1;
+    	}
+		model.setRowCount(0);//清空数据
+		for (int j = 0; j < tableBeans.get(pageNum).size(); j++) {
+			GzxqBean quotation = tableBeans.get(pageNum).get(j);
+			String[] row = {pageNum*10+j+1+"",quotation.getSfId(),quotation.getInstanceId(),quotation.getHead(),quotation.getScheduledtime(),quotation.getReason(),quotation.getJsgyrequirements(),"打开","设计",quotation.getState()};
+			model.addRow(row);
+		}
+	}
+});
+
+wy.addActionListener(new ActionListener() {
+	
+	@Override
+	public void actionPerformed(ActionEvent var1) {
+		// TODO Auto-generated method stub
+		pageNum = tableBeans.size()-1;
+		model.setRowCount(0);//清空数据
+		for (int j = 0; j < tableBeans.get(pageNum).size(); j++) {
+			GzxqBean quotation = tableBeans.get(pageNum).get(j);
+			String[] row = {pageNum*10+j+1+"",quotation.getSfId(),quotation.getInstanceId(),quotation.getHead(),quotation.getScheduledtime(),quotation.getReason(),quotation.getJsgyrequirements(),"打开","设计",quotation.getState()};
+			model.addRow(row);
+		}
+	}
+});
         jTable1.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
                 {null, null, null, null},
@@ -112,13 +244,23 @@ public class NewJFrame extends javax.swing.JFrame {
                 "Title 1", "Title 2", "Title 3", "Title 4"
             }
         ));
+        
+        jTable3.setModel(new javax.swing.table.DefaultTableModel(
+                new Object [][] {
+                    {null, null, null, null}
+                   
+                },
+                new String [] {
+                    "Title 1", "Title 2", "Title 3", "Title 4"
+                }
+            ));
      
         jScrollPane2.setViewportView(jTable1);
         
         setBackground(new java.awt.Color(255, 255, 255));
        // this.setBackground(new java.awt.Color(255, 255, 255));
         jPanel1.setBackground(new java.awt.Color(255, 255, 255));
-        jPanel1.setPreferredSize(new Dimension(900, 400));
+        jPanel1.setPreferredSize(new Dimension(1200, 250));
         jPanel1.setBorder(new TitledBorder(new EtchedBorder()));
         jLabel2.setText("流程实例ID");
 
@@ -172,6 +314,13 @@ public class NewJFrame extends javax.swing.JFrame {
         jButton1.setText("jButton1");
 
         jButton2.setText("查询");
+        
+        //分页
+        sy.setText("首页");
+        xyy.setText("下一页");
+        syy.setText("上一页");
+        wy.setText("尾页");
+        
         jButton2.addActionListener(new ActionListener() {
         	@Override
         	public void actionPerformed(ActionEvent actionEvent) {
@@ -182,7 +331,17 @@ public class NewJFrame extends javax.swing.JFrame {
 //        			// MessageBox.post(MaterialNoDialog.this, "连接TC数据库失败", "", MessageBox.ERROR);
 //        			return;
 //        		}
+        		String factory = "";
         		String sql = "select * from \"CHINT_ FROCK\" where 1=1 ";
+				try {
+					factory = SAPUtil.getGroupID(session);
+					sql = "select * from \"CHINT_ FROCK\" where FACTORY = '"+factory+"' ";
+				} catch (TCException e1) {
+					// TODO Auto-generated catch block
+					System.out.println("获取组织失败");
+					e1.printStackTrace();
+				}
+ 		
         		if(jTextField1.getText()!=null && !"".equals(jTextField1.getText().trim())) {
         			sql += "and instanceId = \'" + jTextField1.getText() +"\'";
         		}
@@ -215,7 +374,10 @@ public class NewJFrame extends javax.swing.JFrame {
         		}
         		System.out.println("sql:"+sql);
         		PreparedStatement statement;
+        	
+
 				try {
+					int z=1;
 					statement = conn.prepareStatement(sql);
 					ResultSet res = statement.executeQuery();
 					List<GzxqBean> quotations = new ArrayList<GzxqBean>();
@@ -237,12 +399,18 @@ public class NewJFrame extends javax.swing.JFrame {
 							res.getString("link") != null ? res.getString("link") : "",
 							res.getString("state") != null ? res.getString("state") : ""
 						);
+						if(z % 10 ==1) {
+							quotations = new ArrayList<GzxqBean>();
+		    				tableBeans.add(quotations);
+		    			}
 						quotations.add(gzxqBean);
+						z = z+1;
 					}
+					pageNum = 0;
 					//将数据插入到表格
 					String[] title =  new String [] { "序号","申请人","流程实例ID","工艺负责人","计划时间", "委托理由", "技术工艺要求", "OA表单链接","创建工装需求","状态"};
 //					DefaultTableModel model = new DefaultTableModel(new Object [][] {},title);
-					DefaultTableModel model = new DefaultTableModel(new Object [][] {},title) {
+					model = new DefaultTableModel(new Object [][] {},title) {
 							
 						// 重写isCellEditable方法，禁止第一列 第二列 第五列单元格编辑
 						@Override
@@ -262,9 +430,9 @@ public class NewJFrame extends javax.swing.JFrame {
 //					    }
 //					};
 					jTable2.setModel(model);
-					if(quotations.size() > 0) {
-						for(int i = 0;i<quotations.size();i++) {
-							GzxqBean quotation = quotations.get(i);
+					if(tableBeans.get(0).size() > 0) {
+						for(int i = 0;i<tableBeans.get(0).size();i++) {
+							GzxqBean quotation = tableBeans.get(0).get(i);
 							String[] row = {i+1+"",quotation.getSfId(),quotation.getInstanceId(),quotation.getHead(),quotation.getScheduledtime(),quotation.getReason(),quotation.getJsgyrequirements(),"打开","设计",quotation.getState()};
 							model.addRow(row);
 						}
@@ -291,16 +459,16 @@ public class NewJFrame extends javax.swing.JFrame {
 			        TableColumnModel columnModel = jTable2.getColumnModel();
 			        jTable2.setRowHeight(40);
 			        //设置行高
-					columnModel.getColumn(0).setPreferredWidth(50);
-					columnModel.getColumn(1).setPreferredWidth(70);
-					columnModel.getColumn(2).setPreferredWidth(70);
-					columnModel.getColumn(3).setPreferredWidth(70);
+					columnModel.getColumn(0).setPreferredWidth(10);
+					columnModel.getColumn(1).setPreferredWidth(50);
+					columnModel.getColumn(2).setPreferredWidth(80);
+					columnModel.getColumn(3).setPreferredWidth(30);
 					columnModel.getColumn(4).setPreferredWidth(70);
-					columnModel.getColumn(5).setPreferredWidth(150);
+					columnModel.getColumn(5).setPreferredWidth(170);
 					columnModel.getColumn(6).setPreferredWidth(120);
-					columnModel.getColumn(7).setPreferredWidth(100);
-					columnModel.getColumn(8).setPreferredWidth(100);
-					columnModel.getColumn(9).setPreferredWidth(70);
+					columnModel.getColumn(7).setPreferredWidth(60);
+					columnModel.getColumn(8).setPreferredWidth(60);
+					columnModel.getColumn(9).setPreferredWidth(40);
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -365,7 +533,8 @@ public class NewJFrame extends javax.swing.JFrame {
                                             .addComponent(jLabel10)
                                             .addComponent(jLabel9)
                                             .addComponent(jLabel8)
-                                            .addComponent(jLabel15))
+                                            //.addComponent(jLabel15)
+                                            )
                                         .addGap(18, 18, 18)
                                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                             .addComponent(jTextField8)
@@ -373,7 +542,8 @@ public class NewJFrame extends javax.swing.JFrame {
                                             .addComponent(jTextField9)
                                             .addComponent(jTextField10, javax.swing.GroupLayout.DEFAULT_SIZE, 150, Short.MAX_VALUE)
                                             .addComponent(jTextField11)
-                                            .addComponent(jTextField14))
+                                            //.addComponent(jTextField14)
+                                            )
                                         .addGap(108, 108, 108))))
                             .addGroup(jPanel1Layout.createSequentialGroup()
                                 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -381,7 +551,8 @@ public class NewJFrame extends javax.swing.JFrame {
                     .addGroup(jPanel1Layout.createSequentialGroup()
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(jLabel6)
-                            .addComponent(jLabel14))
+                            //.addComponent(jLabel14)
+                            )
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                             .addComponent(jTextField4)
@@ -438,9 +609,12 @@ public class NewJFrame extends javax.swing.JFrame {
                         .addGap(28, 28, 28)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                             .addComponent(jTextField13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel15)
-                            .addComponent(jTextField14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addComponent(jLabel14))
+                           // .addComponent(jLabel15)
+                            //.addComponent(jTextField14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            )
+                        )
+                   // .addComponent(jLabel14)
+                    )
                 .addGap(18, 18, 18)
                 .addComponent(jButton2)
                 .addGap(359, 359, 359)
@@ -465,10 +639,10 @@ public class NewJFrame extends javax.swing.JFrame {
        // jTable2.setBackground(new java.awt.Color(255, 255, 255));
        // jTable2.setRowHeight(30);
         TableColumnModel columnModel = jTable2.getColumnModel();
-		columnModel.getColumn(0).setPreferredWidth(50);
+		columnModel.getColumn(0).setPreferredWidth(40);
 		columnModel.getColumn(1).setPreferredWidth(70);
 		columnModel.getColumn(2).setPreferredWidth(70);
-		columnModel.getColumn(3).setPreferredWidth(70);
+		columnModel.getColumn(3).setPreferredWidth(50);
 		columnModel.getColumn(4).setPreferredWidth(70);
 		columnModel.getColumn(5).setPreferredWidth(150);
 		columnModel.getColumn(6).setPreferredWidth(120);
@@ -482,7 +656,7 @@ public class NewJFrame extends javax.swing.JFrame {
         //jPanel2.setBackground(new java.awt.Color(255, 255, 255));
         javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
         jPanel2.setLayout(jPanel2Layout);
-        jPanel2.setPreferredSize(new Dimension(900,300));
+        jPanel2.setPreferredSize(new Dimension(1200,431));
         jPanel2Layout.setHorizontalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 810, Short.MAX_VALUE)
@@ -492,6 +666,50 @@ public class NewJFrame extends javax.swing.JFrame {
             .addComponent(jScrollPane3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE)
         );
 
+        
+        
+        jScrollPane4.setViewportView(jTable3);
+        jScrollPane4.getViewport().setBackground(new java.awt.Color(255, 255, 255));
+        //jPanel2.setBackground(new java.awt.Color(255, 255, 255));
+        javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel3);
+        jPanel3.setLayout(jPanel4Layout);
+        jPanel3.setPreferredSize(new Dimension(1200,40));
+       
+     
+        
+        jPanel4Layout.setHorizontalGroup(
+                jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createSequentialGroup()
+                    .addContainerGap()
+                    .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addGroup(jPanel4Layout.createSequentialGroup()
+                            .addComponent(sy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addComponent(syy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addComponent(xyy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addComponent(wy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+    )
+                    .addContainerGap())
+            );
+            jPanel4Layout.setVerticalGroup(
+                jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createSequentialGroup()
+                    .addContainerGap()
+                    .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addComponent(sy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(syy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(xyy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(wy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                   
+                    .addContainerGap())
+            );
+
+        
+        
+        
+        
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -499,6 +717,7 @@ public class NewJFrame extends javax.swing.JFrame {
             .addGroup(layout.createSequentialGroup()
                 .addGap(20, 20, 20)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                		.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 271, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -512,12 +731,17 @@ public class NewJFrame extends javax.swing.JFrame {
                 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
         
         pack();
+        
+        
     }// </editor-fold>                        
 
+    
     /**
      * @param args the command line arguments
      */
@@ -568,43 +792,7 @@ public class NewJFrame extends javax.swing.JFrame {
          });
     }
 
-    // Variables declaration - do not modify                     
-    private javax.swing.JButton jButton1;
-    private javax.swing.JButton jButton2;
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel10;
-    private javax.swing.JLabel jLabel11;
-    private javax.swing.JLabel jLabel12;
-    private javax.swing.JLabel jLabel13;
-    private javax.swing.JLabel jLabel14;
-    private javax.swing.JLabel jLabel15;
-    private javax.swing.JLabel jLabel2;
-    private javax.swing.JLabel jLabel3;
-    private javax.swing.JLabel jLabel4;
-    private javax.swing.JLabel jLabel5;
-    private javax.swing.JLabel jLabel6;
-    private javax.swing.JLabel jLabel7;
-    private javax.swing.JLabel jLabel8;
-    private javax.swing.JLabel jLabel9;
-    private javax.swing.JPanel jPanel1;
-    private javax.swing.JPanel jPanel2;
-    private javax.swing.JScrollPane jScrollPane2;
-    private javax.swing.JScrollPane jScrollPane3;
-    private javax.swing.JTable jTable1;
-    private javax.swing.JTable jTable2;
-    private javax.swing.JTextField jTextField1;
-    private javax.swing.JTextField jTextField10;
-    private javax.swing.JTextField jTextField11;
-    private javax.swing.JTextField jTextField12;
-    private javax.swing.JTextField jTextField13;
-    private javax.swing.JTextField jTextField14;
-    private javax.swing.JTextField jTextField2;
-    private javax.swing.JTextField jTextField3;
-    private javax.swing.JTextField jTextField4;
-    private javax.swing.JTextField jTextField5;
-    private javax.swing.JTextField jTextField6;
-    private javax.swing.JTextField jTextField7;
-    private javax.swing.JTextField jTextField8;
-    private javax.swing.JTextField jTextField9;
-    // End of variables declaration                   
+  
+    
+    
 }