diff --git a/com.connor.chint.wuhan/.classpath b/com.connor.chint.wuhan/.classpath
index a319f6d..2416ab4 100644
--- a/com.connor.chint.wuhan/.classpath
+++ b/com.connor.chint.wuhan/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="json_lib/jfxrt.jar"/>
 	<classpathentry exported="true" kind="lib" path="poi/okhttp-2.7.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="json_lib/JavaFx-DateTimePicker-0.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="json_lib/jfxrt.jar"/>
 	<classpathentry exported="true" kind="lib" path="json_lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="json_lib/commons-collections-3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="json_lib/commons-lang-2.4.jar"/>
diff --git a/com.connor.chint.wuhan/META-INF/MANIFEST.MF b/com.connor.chint.wuhan/META-INF/MANIFEST.MF
index 87e51af..e1c8ceb 100644
--- a/com.connor.chint.wuhan/META-INF/MANIFEST.MF
+++ b/com.connor.chint.wuhan/META-INF/MANIFEST.MF
@@ -113,6 +113,6 @@ Bundle-ClassPath: .,
  poi/woden-impl-dom-1.0M9.jar,
  poi/wsdl4j-1.6.2.jar,
  poi/wstx-asl-3.2.9.jar,
- json_lib/jfxrt.jar,
  json_lib/JavaFx-DateTimePicker-0.0.1.jar,
- poi/okhttp-2.7.4.jar
+ poi/okhttp-2.7.4.jar,
+ json_lib/jfxrt.jar
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
index c89bc99..2ab9c05 100644
--- a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
@@ -10,7 +10,7 @@
 
 <StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.DetailsController">
    <children>
-      <GridPane>
+      <GridPane fx:id="girdPane">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
@@ -20,14 +20,14 @@
             <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <FlowPane alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
+            <FlowPane fx:id="flowPane" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
                <children>
                   <CheckBox fx:id="cb_errBtn" mnemonicParsing="false" onAction="#errBtnAction" text="仅显示错误数据" />
                </children>
             </FlowPane>
-            <ScrollPane prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
+            <ScrollPane fx:id="scrollPane" prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
                <content>
-                  <TableView fx:id="tableView" prefHeight="700.0" prefWidth="1190.0" style="-fx-faint-focus-color: transparent;">
+                  <TableView fx:id="tableView" prefHeight="660.0" prefWidth="1180.0" style="-fx-faint-focus-color: transparent;">
                     <columns>
                       <TableColumn fx:id="tc_xh" prefWidth="75.0" text="序号" />
                       <TableColumn fx:id="tc_batch" prefWidth="75.0" text="批次号" />
@@ -65,7 +65,7 @@
                <right>
                   <FlowPane alignment="TOP_CENTER" prefHeight="140.0" prefWidth="589.0" BorderPane.alignment="CENTER">
                      <children>
-                        <TextField alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
+                        <TextField fx:id="pageNumTxt" alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
                         <Label fx:id="lb_page" prefWidth="80.0" text="/" />
                         <Button mnemonicParsing="false" onAction="#outputAction" text="结果导出" />
                      </children>
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
index de0cdec..ca27f2b 100644
--- a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
@@ -10,9 +10,9 @@
 
 <StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1600.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.SearchSapController">
    <children>
-      <ScrollPane prefHeight="200.0">
+      <ScrollPane fx:id="scrollPane" prefHeight="200.0">
          <content>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
+            <BorderPane fx:id="topBorder" prefHeight="200.0" prefWidth="200.0">
                <top>
                   <TitledPane fx:id="tp_sxtj" prefHeight="650.0" text="筛选条件" BorderPane.alignment="CENTER">
                      <padding>
@@ -114,9 +114,9 @@
                                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                 </rowConstraints>
                                  <children>
-                                    <Button fx:id="bt_close" mnemonicParsing="false" text="关闭" GridPane.columnIndex="3" />
+                                    <Button fx:id="bt_close" mnemonicParsing="false" onAction="#closeClick" text="关闭" GridPane.columnIndex="3" />
                                     <Button fx:id="bt_search" mnemonicParsing="false" onAction="#searchAction" text="查询" GridPane.columnIndex="1" />
-                                    <Button fx:id="bt_czcx" mnemonicParsing="false" text="重置查询" GridPane.columnIndex="2" />
+                                    <Button fx:id="bt_czcx" mnemonicParsing="false" onAction="#resetClick" text="重置查询" GridPane.columnIndex="2" />
                                  </children>
                               </GridPane>
                            </bottom>
@@ -125,7 +125,7 @@
                   </TitledPane>
                </top>
                <center>
-                  <BorderPane prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
+                  <BorderPane fx:id="resultBorder" prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
                      <top>
                         <TitledPane fx:id="tp_result" prefHeight="600.0" prefWidth="200.0" text="结果" BorderPane.alignment="CENTER">
                            <padding>
diff --git a/com.connor.chint.wuhan/build.properties b/com.connor.chint.wuhan/build.properties
index f623c40..460f138 100644
--- a/com.connor.chint.wuhan/build.properties
+++ b/com.connor.chint.wuhan/build.properties
@@ -81,6 +81,6 @@ bin.includes = plugin.xml,\
                json_lib/json-lib-2.2.2-jdk15.jar,\
                json_lib/json-lib-2.2.3-jdk13.jar,\
                json_lib/xom-1.2.5.jar,\
-               json_lib/jfxrt.jar,\
                json_lib/JavaFx-DateTimePicker-0.0.1.jar,\
-               poi/okhttp-2.7.4.jar
+               poi/okhttp-2.7.4.jar,\
+               json_lib/jfxrt.jar
diff --git a/com.connor.chint.wuhan/json_lib/jfxrt.jar b/com.connor.chint.wuhan/json_lib/jfxrt.jar
index 275c31a..a8cca25 100644
Binary files a/com.connor.chint.wuhan/json_lib/jfxrt.jar and b/com.connor.chint.wuhan/json_lib/jfxrt.jar differ
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/ChildMessage.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/ChildMessage.java
index 0e2fe1e..46c3b05 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/ChildMessage.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/ChildMessage.java
@@ -10,12 +10,12 @@ import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
 public class ChildMessage extends Application { 
-	private List<List<DetailsBean>> tableBeans;
+//	private List<List<DetailsBean>> tableBeans;
 	private boolean onlyError;
 	private StringBuilder sqlTotal;
-    public ChildMessage(List<List<DetailsBean>> tableBeans,boolean onlyError,StringBuilder sqlTotal) {
+    public ChildMessage(boolean onlyError,StringBuilder sqlTotal) {
 		super();
-		this.tableBeans = tableBeans;
+//		this.tableBeans = tableBeans;
 		this.onlyError = onlyError;
 		this.sqlTotal = sqlTotal;
 	}
@@ -28,7 +28,7 @@ public class ChildMessage extends Application {
 		Scene scene = new Scene(root, 1200.0, 800.0);
         DetailsController controller = (DetailsController) fxmlLoader.getController();
         primaryStage.setTitle("SAP���ݽ����ϸ");
-        controller.initData(primaryStage,tableBeans,onlyError,sqlTotal);
+        controller.initData(primaryStage,onlyError,sqlTotal);
         primaryStage.setScene(scene);
         primaryStage.show();
     }
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java
index 63b15ba..a4d071e 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/DetailsController.java
@@ -1,6 +1,7 @@
 package com.chint.plm.SearchSapResult;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,6 +13,8 @@ import com.teamcenter.rac.kernel.TCSession;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -19,205 +22,291 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
+/**
+ * @author cyh
+ *
+ */
+/**
+ * @author cyh
+ *
+ */
 public class DetailsController {
-	
+
 	@FXML
-    private Button bt_last;
-    @FXML
-    private Button bt_next;
+	private Button bt_last;
 	@FXML
-    private TableColumn<DetailsBean, String> tc_cDate;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_msg;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_cTime;
+	private Button bt_next;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_cDate;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_msg;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_cTime;
 
-    @FXML
-    private TableView<DetailsBean> tableView;
+	@FXML
+	private TableView<DetailsBean> tableView;
 
-    @FXML
-    private TableColumn<DetailsBean, String> tc_returnTime;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_returnTime;
 
-    @FXML
-    private TableColumn<DetailsBean, String> tc_batch;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_batch;
 
     @FXML
-    private TableColumn<DetailsBean, String> tc_wbs;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_SapResult;
+    private TextField pageNumTxt;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_wbs;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_SapResult;
 
-    @FXML
-    private TableColumn<DetailsBean, Integer> tc_xh;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_material;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_returnDate;
-    @FXML
-    private TableColumn<DetailsBean, String> tc_plm;
-    @FXML
-    private CheckBox cb_errBtn;
-    @FXML
-    private Label lb_page;
-    @FXML
-    private Button bt_first;
-    @FXML
-    private StackPane stackPane;
-    @FXML
-    private Button bt_tail;
+	@FXML
+	private TableColumn<DetailsBean, Integer> tc_xh;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_material;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_returnDate;
+	@FXML
+	private TableColumn<DetailsBean, String> tc_plm;
+	@FXML
+	private CheckBox cb_errBtn;
+	@FXML
+	private Label lb_page;
+	@FXML
+	private Button bt_first;
+	@FXML
+	private StackPane stackPane;
+	@FXML
+	private Button bt_tail;
 
-    @FXML
-    private Button bt_all;
+	@FXML
+	private Button bt_all;
 
-    int pageNum = 0;
-    List<List<DetailsBean>> tableBeans;
-    @FXML
-    void firstAction(ActionEvent event) {
-    	pageNum = 0;
-    	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
+	int pageNum = 0;
+	List<List<DetailsBean>> tableBeans;
+
+	@FXML
+	void firstAction(ActionEvent event) {
+		pageNum = 0;
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
+	}
 
-    @FXML
-    void lastAction(ActionEvent event) {
-    	if(pageNum>0) {
-    		pageNum = pageNum -1;
-    	}
-    	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	@FXML
+	void lastAction(ActionEvent event) {
+		if (pageNum > 0) {
+			pageNum = pageNum - 1;
+		}
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
+	}
 
-    @FXML
-    void nextAction(ActionEvent event) {
-    	if(pageNum<tableBeans.size()-1) {
-    		pageNum = pageNum +1;
-    	}
-    	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	@FXML
+	void nextAction(ActionEvent event) {
+		if (pageNum < tableBeans.size() - 1) {
+			pageNum = pageNum + 1;
+		}
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
+	}
 
-    @FXML
-    void tailAction(ActionEvent event) {
-    	pageNum = tableBeans.size()-1;
-    	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	@FXML
+	void tailAction(ActionEvent event) {
+		pageNum = tableBeans.size() - 1;
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
+	}
 
-    @FXML
-    void allAction(ActionEvent event) {
-    	List<DetailsBean> allBeans = new ArrayList<DetailsBean>();
-    	for(int i=0;i<tableBeans.size();i++) {
-    		allBeans.addAll(tableBeans.get(i));
-    	}
-    	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
+	@FXML
+	private FlowPane flowPane;
+	@FXML
+	private ScrollPane scrollPane;
+	@FXML
+	private GridPane girdPane;
+
+	/**
+	 * @param event
+	 * @function ����ȫ��
+	 */
+	@FXML
+	void allAction(ActionEvent event) {
+		List<DetailsBean> allBeans = new ArrayList<DetailsBean>();
+		for (int i = 0; i < tableBeans.size(); i++) {
+			allBeans.addAll(tableBeans.get(i));
+		}
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(allBeans);
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
-    protected AbstractAIFApplication app;
-    private TCSession session;
-    @FXML
-    void outputAction(ActionEvent event) {
+	}
+
+	protected AbstractAIFApplication app;
+	private TCSession session;
 
-    }
-    private StringBuilder sqlTotal;
-	public void initData(Stage primaryStage,List<List<DetailsBean>> tableBeans,boolean onlyError,StringBuilder sqlTotal) {
+	
+	/**
+	 * @param event
+	 * @function ����
+	 */
+	@FXML
+	void outputAction(ActionEvent event) {
+
+	}
+
+	private StringBuilder sqlTotal;
+
+	public void initData(Stage primaryStage, boolean onlyError,
+			StringBuilder sqlTotal) {
 		// TODO Auto-generated method stub
 		this.sqlTotal = sqlTotal;
-		
+
 		this.app = AIFUtility.getCurrentApplication();
 		this.session = (TCSession) app.getSession();
-		//�����а�bean����
-		tc_xh.setSortable(false); 
-		tc_cDate.setSortable(false); 
-		tc_msg.setSortable(false); 
-		tc_cTime.setSortable(false); 
-		tc_returnTime.setSortable(false); 
-		tc_batch.setSortable(false); 
-		tc_wbs.setSortable(false); 
+		// �����а�bean����
+		tc_xh.setSortable(false);
+		tc_cDate.setSortable(false);
+		tc_msg.setSortable(false);
+		tc_cTime.setSortable(false);
+		tc_returnTime.setSortable(false);
+		tc_batch.setSortable(false);
+		tc_wbs.setSortable(false);
 		tc_SapResult.setSortable(false);
-		tc_plm.setSortable(false); 
+		tc_plm.setSortable(false);
 		tc_material.setSortable(false);
 		tc_returnDate.setSortable(false);
-        //�а�bean����
-		tc_xh.setCellValueFactory(new PropertyValueFactory<DetailsBean,Integer>("num"));
-		tc_batch.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("batchNum"));
-		tc_material.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("productMaterialNo"));
-		tc_wbs.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("wbsNo"));
-		tc_SapResult.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("status"));
+		// �а�bean����
+		tc_xh.setCellValueFactory(new PropertyValueFactory<DetailsBean, Integer>("num"));
+		tc_batch.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("batchNum"));
+		tc_material.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("productMaterialNo"));
+		tc_wbs.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("wbsNo"));
+		tc_SapResult.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("status"));
 		tc_msg.setCellValueFactory(new PropertyValueFactory<>("message"));
 //				tc_log.setCellValueFactory(new PropertyValueFactory<>("user"));
-		tc_cDate.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("createDate"));
-		tc_cTime.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("createTime"));
-		tc_returnDate.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("returnDate"));
-		tc_returnTime.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("returnTime"));
-		tc_plm.setCellValueFactory(new PropertyValueFactory<DetailsBean,String>("plmStatus"));
+		tc_cDate.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("createDate"));
+		tc_cTime.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("createTime"));
+		tc_returnDate.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("returnDate"));
+		tc_returnTime.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("returnTime"));
+		tc_plm.setCellValueFactory(new PropertyValueFactory<DetailsBean, String>("plmStatus"));
+
+		//���п�
+		tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.05));
+		tc_batch.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_material.prefWidthProperty().bind(tableView.widthProperty().multiply(0.12));
+		tc_wbs.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_SapResult.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_msg.prefWidthProperty().bind(tableView.widthProperty().multiply(0.35));
+		tc_cDate.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_cTime.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_returnDate.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_returnTime.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_plm.prefWidthProperty().bind(tableView.widthProperty().multiply(0.07));
 		
+		//������ѯ��Ĭ�ϴ�������
+		try {
+			cb_errBtn.setSelected(true);
+			searchErrMsg();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-		
-		this.tableBeans = tableBeans;
-		
+		lb_page.setText("/"+tableBeans.size());
+//		this.tableBeans = tableBeans;
+
+		//��󻯰�
+		primaryStage.widthProperty().addListener(new ChangeListener<Number>() {
+			@Override
+			public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+				// ����GUI���
+				// Platform.runLater(new Runnable() {
+				double width = primaryStage.getWidth();
+				System.out.println("width==>" + width);
+				girdPane.setPrefWidth(width * 0.98);
+				flowPane.setPrefWidth(width * 0.98);
+				scrollPane.setPrefWidth(width * 0.98);
+				tableView.setPrefWidth(width * 0.98);
+			}
+		});
+		primaryStage.setMaximized(true);
 	}
 
-    @FXML
-    void errBtnAction(ActionEvent event) {
-    	
-    	try {
-    		String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session);
-         	 //����BOM������Ϣ : ȫ��״̬.
-         	List<List<DetailsBean>> tableBeans = new ArrayList<List<DetailsBean>>();
-         	SqlUtil.getTCDataConnection(prefs);
-         	String sqlDetail = "";
-        	if(cb_errBtn.isSelected()) {
-        		sqlDetail = sqlTotal.toString()+" and status = 'E' ";
-        	}else {
-        		sqlDetail = sqlTotal.toString()+" and status = 'S' ";
-        	}
-         	ResultSet read = SqlUtil.read(sqlDetail);
-         	int i=1;
-         	List<DetailsBean> beanList = null;
-     		while(read.next()) {
-     			//��ҳ 20  ��ѯ����������
-     			DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i),
-     					new SimpleStringProperty(read.getString(1)),new SimpleStringProperty(read.getString(2)),
-     					new SimpleStringProperty(read.getString(3)),new SimpleStringProperty(read.getString(4)),
-     					new SimpleStringProperty(read.getString(5)),new SimpleStringProperty(read.getString(6)),
-     					new SimpleStringProperty(read.getString(7)),new SimpleStringProperty(read.getString(8)),
-     					new SimpleStringProperty(read.getString(9)),new SimpleStringProperty(read.getString(10)));
-     			if(i % 20 ==1) {
-     				beanList = new ArrayList<DetailsBean>();
-     				tableBeans.add(beanList);
-     			}
-     			beanList.add(sumBean);
-     			i=i+1;
-     		}
-         	SqlUtil.freeAll();
-         	if(tableBeans.size()==0) {
-         		beanList = new ArrayList<DetailsBean>();
- 				tableBeans.add(beanList);
-         	}
-         	ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
-    		tableView.getItems().clear();
-    		tableView.setItems(data);
-    		pageNum = 0;
-    		
-        }catch(Exception ex){
-         	ex.printStackTrace();
-        }finally {
-         	System.out.println("END"+sqlTotal.toString());
-         	SqlUtil.freeAll();
-        }
-    }
+	/**
+	 * @param event
+	 * @function ֻ��ʾ��������
+	 */
+	@FXML
+	void errBtnAction(ActionEvent event) {
+
+		try {
+			cb_errBtn.setDisable(true);
+			searchErrMsg();
+			cb_errBtn.setDisable(false);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		} finally {
+			System.out.println("END" + sqlTotal.toString());
+			SqlUtil.freeAll();
+		}
+	}
 	
+	/**
+	 * @throws Exception
+	 * @function ��ʾ��������
+	 */
+	private void searchErrMsg() throws Exception {
+		String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session);
+		// ����BOM������Ϣ : ȫ��״̬.
+		List<List<DetailsBean>> tableBeans = new ArrayList<List<DetailsBean>>();
+		SqlUtil.getTCDataConnection(prefs);
+		String sqlDetail = "";
+		if (cb_errBtn.isSelected()) {
+			sqlDetail = sqlTotal.toString() + " and status = 'E' ";
+		} else {
+			sqlDetail = sqlTotal.toString();// + " and status = 'S' ";
+		}
+		ResultSet read = SqlUtil.read(sqlDetail);
+		int i = 1;
+		List<DetailsBean> beanList = null;
+		while (read.next()) {
+			// ��ҳ 20 ��ѯ����������
+			DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i),
+					new SimpleStringProperty(read.getString(1)), new SimpleStringProperty(read.getString(2)),
+					new SimpleStringProperty(read.getString(3)), new SimpleStringProperty(read.getString(4)),
+					new SimpleStringProperty(read.getString(5)), new SimpleStringProperty(read.getString(6)),
+					new SimpleStringProperty(read.getString(7)), new SimpleStringProperty(read.getString(8)),
+					new SimpleStringProperty(read.getString(9)), new SimpleStringProperty(read.getString(10)));
+			if (i % 20 == 1) {
+				beanList = new ArrayList<DetailsBean>();
+				tableBeans.add(beanList);
+			}
+			beanList.add(sumBean);
+			i = i + 1;
+		}
+		SqlUtil.freeAll();
+		if (tableBeans.size() == 0) {
+			beanList = new ArrayList<DetailsBean>();
+			tableBeans.add(beanList);
+		}
+		ObservableList<DetailsBean> data = FXCollections.observableArrayList(tableBeans.get(0));
+		tableView.getItems().clear();
+		tableView.setItems(data);
+		pageNum = 0;
+		this.tableBeans = tableBeans;
+		lb_page.setText("/"+tableBeans.size());
+	}
 
 }
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java
index e04facb..74cb30e 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java
@@ -1,23 +1,32 @@
 package com.chint.plm.SearchSapResult;
 
+import java.awt.Component;
 import java.awt.Window;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
 import java.sql.ResultSet;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.JFrame;
+
 import org.casic.javafx.control.DateTimePicker;
 
+import com.chint.plm.createEcn.CreateEcnFrame;
 import com.chint.plm.fxUtil.KFXPanel;
 import com.chint.plm.fxUtil.KFXPanelController;
 import com.connor.chint.sap2.util.ChintPreferenceUtil;
+import com.connor.chint.sap2.util.SAPUtil;
 import com.connor.chint.sap2.util.SqlUtil;
+import com.connor.plm.CostListManagement.pojo.QuotationMX;
 import com.teamcenter.rac.aif.AbstractAIFApplication;
 import com.teamcenter.rac.aifrcp.AIFUtility;
 import com.teamcenter.rac.kernel.TCSession;
 import com.teamcenter.rac.util.MessageBox;
 
+import edu.emory.mathcs.backport.java.util.Arrays;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -25,261 +34,282 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SingleSelectionModel;
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.StackPane;
 
 public class SearchSapController extends KFXPanelController {
-	
-	
-	@FXML
-    private TitledPane tp_result;
-
-    @FXML
-    private Button bt_closeAll;
-
-    @FXML
-    private TitledPane mxtjPane;
-
-   
-    
-    @FXML
-    private GridPane bt_cx; // ��ť��pane
-    @FXML
-    private Button bt_close; //�ر�
-
-    @FXML
-    private Button bt_czcx;//���ò�ѯ
-    @FXML
-    private StackPane stackPane;
-
-   
-
-    //table����  
-    @FXML
-    private TableColumn<SumTableBean,String> tc_xh;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_zrws;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_rwh;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_fqsj;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_fqr;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_status;
-    @FXML
-    private TableColumn<SumTableBean,Object> tc_log;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_sapState;
-    @FXML
-    private TableColumn<SumTableBean,String> tc_plm;
-    @FXML
-    private TableColumn<SumTableBean,Object> tc_result;
-    @FXML
-    private TitledPane tp_sxtj;//ɸѡ����pane
-    @FXML
-    private TitledPane rwtjPane; //��������pane
-    
-    @FXML
-    private GridPane gridPane; //��һ��pane�������ڿؼ�
-    @FXML
-    private TextField tx_bh; //�ı� ������
-    @FXML
-    private ComboBox<String> cb_factory; //��������
-    @FXML
-    private TextField tx_wbs; //wbs��
-    @FXML
-    private ComboBox<String> cb_status; //����״̬
-    @FXML
-    private TextField tx_user;//������
-    @FXML
-    private ComboBox<String> cb_sapState; //sap�������
-    @FXML
-    private TextField tx_projectName;//��Ŀ����
-    @FXML
-    private CheckBox bt_errTask;//��ѯ�������� 
-    @FXML
-    private CheckBox bt_errMsg; // ����BOM������Ϣ
-    //��ϸ����
-    @FXML
-    private ComboBox<String> tx_sapStatus;//sap����״̬
-    @FXML
-    private TextField tx_pcode;//�����ϱ���
-    @FXML
-    private TextField tx_wbsMx;//wbs
-    @FXML
-    private TextField tx_sapReturn;//sap������Ϣ
-    @FXML
-    private TextField tx_batchNum;//���κ�
-    
-    @FXML
-    private Button bt_wy; //��ťβҳ
-    @FXML
-    private Button bt_syy; //��һҳ
-    @FXML
-    private Button bt_xyy;//��һҳ
-    @FXML
-    private Button bt_sy;//��ҳ
-    @FXML
-    private Button bt_search;
-    @FXML
-    private TableView<SumTableBean> tableView;
-    //ȫ���ر� 
-    @FXML
-    void clossAll(ActionEvent event) {
-    	frame.dispose();
-    }
-    String getCombText(Object comb) {
-    	String textVal = "";
-    	if(comb instanceof TextField) {
-    		textVal = ((TextField)comb).getText();
-    	}else if(comb instanceof ComboBox) {
-    		SingleSelectionModel<?> selectionModel = ((ComboBox<?>)comb).getSelectionModel();
-    		if(selectionModel.getSelectedIndex()>=0) {
-    			textVal = ((ComboBox<?>)comb).getSelectionModel().getSelectedItem().toString();
-    		}
-    	}else if(comb instanceof CheckBox) {
-    		boolean selected = ((CheckBox)comb).isSelected();
-    	}
-    	return textVal;
-    }
-    private int pageNum;//��ҳ��ʾ��ǰ�ڼ�ҳ
-    private List<List<SumTableBean>> tableBeans = new ArrayList<List<SumTableBean>>();
-    //��ѯ����
-    @FXML
-    void searchAction(ActionEvent event) {
-    	//ƴ�Ӳ�ѯ���
-    	StringBuilder sql = new StringBuilder("select \"CODE\",\"USER\",STARTTIME,\"NUMBER\",SAPRESULT,DATASTATUS,PLMRESULT,LOGURL from CHINT_BOM_TO_SAP_SUM where 1=1");
-    	String code = getCombText(tx_bh);
-    	if(!code.isEmpty()) {
-    		sql.append(" and \"CODE\" = '").append(code).append("'");
-    	}
-    	String factory = getCombText(cb_factory);
-    	if(!factory.isEmpty()) {
-    		sql.append(" and factory = '").append(factory).append("'");
-    	}
-    	String wbsno = getCombText(tx_wbs);
-    	if(!wbsno.isEmpty()) {
-    		sql.append(" and wbsno = '").append(wbsno).append("'");
-    	}
-    	String datastatus = getCombText(cb_status);
-    	if(!datastatus.isEmpty()) {
-    		sql.append(" and datastatus = '").append(datastatus).append("'");
-    	}
-    	String user = getCombText(tx_user);
-    	System.out.println("user==>"+user);
-    	if(!user.isEmpty()) {
-    		sql.append(" and \"USER\" = '").append(user).append("'");
-    	}
-    	String sapresult = getCombText(cb_sapState);
-    	if(!sapresult.isEmpty()) {
-    		sql.append(" and sapresult = '").append(sapresult).append("'");
-    	}
-    	String projectno = getCombText(tx_projectName);
-    	if(!projectno.isEmpty()) {
-    		sql.append(" and projectno = '").append(projectno).append("'");
-    	}
-    	ObjectProperty<LocalDateTime> dateTimeProperty = dateTimeStart.dateTimeProperty();
-    	if(dateTimeProperty!=null &&  dateTimeProperty.get()!=null) {
-    		String startTime = dateTimeProperty.get().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-    		sql.append(" and starttime >= to_date('").append(startTime).append("','yyyy-mm-ddhh24:mi:ss') "); //to_date(?,'yyyy-mm-ddhh24:mi:ss')
-    		System.out.println("startTime==>"+startTime);
-    	}
-    	ObjectProperty<LocalDateTime> dateTimeProperty2 = dateTimeEnd.dateTimeProperty();
-    	if(dateTimeProperty2!=null &&  dateTimeProperty2.get()!=null) {
-    		String endTime = dateTimeProperty2.get().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-    		sql.append(" and starttime <= to_date('").append(endTime).append("','yyyy-mm-ddhh24:mi:ss') "); //to_date(?,'yyyy-mm-ddhh24:mi:ss')
-        	System.out.println("endTime==>"+endTime);
-    	}
-    	//ƴ��DETAILS����SQL��Ϣ
-    	StringBuilder detailSql = new StringBuilder("");
-    	String batchNum = getCombText(tx_batchNum);
-    	if(!batchNum.isEmpty()) {
-    		detailSql.append(" and batchnumber = '").append(batchNum).append("'");
-    	}
-    	String wbsnoDetail = getCombText(tx_wbsMx);
-    	if(!wbsnoDetail.isEmpty()) {
-    		detailSql.append(" and wbsno = '").append(wbsnoDetail).append("'");
-    	}
-    	String message = getCombText(tx_sapReturn);
-    	if(!message.isEmpty()) {
-    		detailSql.append(" and message like '%").append(message).append("%'");
-    	}
-    	String productmaterialno = getCombText(tx_pcode);
-    	if(!productmaterialno.isEmpty()) {
-    		detailSql.append(" and productmaterialno like '%").append(productmaterialno).append("%'");
-    	}
-    	String status = getCombText(tx_sapStatus);
-    	if(!status.isEmpty()) {
-    		if(status.equals("�ɹ�")) {
-    			status = "S";
-    		}else {
-    			status = "E";
-    		}
-    		detailSql.append(" and status = '").append(status).append("'");
-    	}
-    	
-    	String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session);
-    	SqlUtil.getTCDataConnection(prefs);
-    	try {
-    		sql.append(" order by \"CODE\" asc ");
-    		System.out.println("read==>"+sql);
-    		ResultSet read = SqlUtil.read(sql.toString());
-    		int i=1;
-    		List<SumTableBean> beanList = null;
-    		while(read.next()) {
-    			//��ҳ 20  ��ѯ����������
-    			System.out.println("read==>"+read.getInt(4));
-    			SumTableBean sumBean = new SumTableBean(new SimpleIntegerProperty(i),
-    					new SimpleStringProperty(String.valueOf(read.getInt(1))),new SimpleStringProperty(read.getString(2)),
-    					new SimpleStringProperty(read.getString(3)),new SimpleStringProperty(String.valueOf(read.getInt(4))),
-    					new SimpleStringProperty(read.getString(5)),new SimpleStringProperty(read.getString(6)),
-    					new SimpleStringProperty(read.getString(7)),bt_errMsg.isSelected(),detailSql,prefs,code,
-    					read.getString(8));
-    			if(i % 20 ==1) {
-    				beanList = new ArrayList<SumTableBean>();
-    				tableBeans.add(beanList);
-    			}
-    			beanList.add(sumBean);
-    			i=i+1;
-    		}
-    		if(tableBeans.size()==0) {
-    			MessageBox.post("δ��ѯ�����ݼ�¼.","��ʾ",2);
-    			beanList = new ArrayList<SumTableBean>();
-    			tableBeans.add(beanList);
-    		}
-    		pageNum = 0;
-    		System.out.println("beanList==>"+beanList.size());
-    		ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(0));
-    		tableView.getItems().clear();
-    		tableView.setItems(data);
-    	}catch(Exception e) {
-    		e.printStackTrace();
-    	}finally {
-    		SqlUtil.freeAll();
-    	}
+
+	@FXML
+	private TitledPane tp_result;
+
+	@FXML
+	private Button bt_closeAll;
+
+	@FXML
+	private TitledPane mxtjPane;
+
+	@FXML
+	private GridPane bt_cx; // ��ť��pane
+	@FXML
+	private Button bt_close; // �ر�
+
+	@FXML
+	private Button bt_czcx;// ���ò�ѯ
+	@FXML
+	private StackPane stackPane;
+
+	// table����
+	@FXML
+	private TableColumn<SumTableBean, String> tc_xh;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_zrws;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_rwh;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_fqsj;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_fqr;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_status;
+	@FXML
+	private TableColumn<SumTableBean, Object> tc_log;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_sapState;
+	@FXML
+	private TableColumn<SumTableBean, String> tc_plm;
+	@FXML
+	private TableColumn<SumTableBean, Object> tc_result;
+	@FXML
+	private TitledPane tp_sxtj;// ɸѡ����pane
+	@FXML
+	private TitledPane rwtjPane; // ��������pane
+
+	@FXML
+	private GridPane gridPane; // ��һ��pane�������ڿؼ�
+	@FXML
+	private TextField tx_bh; // �ı� ������
+	@FXML
+	private ComboBox<String> cb_factory; // ��������
+	@FXML
+	private TextField tx_wbs; // wbs��
+	@FXML
+	private ComboBox<String> cb_status; // ����״̬
+	@FXML
+	private TextField tx_user;// ������
+	@FXML
+	private ComboBox<String> cb_sapState; // sap�������
+	@FXML
+	private TextField tx_projectName;// ��Ŀ����
+	@FXML
+	private CheckBox bt_errTask;// ��ѯ��������
+	@FXML
+	private CheckBox bt_errMsg; // ����BOM������Ϣ
+	// ��ϸ����
+	@FXML
+	private ComboBox<String> tx_sapStatus;// sap����״̬
+	@FXML
+	private TextField tx_pcode;// �����ϱ���
+	@FXML
+	private TextField tx_wbsMx;// wbs
+	@FXML
+	private TextField tx_sapReturn;// sap������Ϣ
+	@FXML
+	private TextField tx_batchNum;// ���κ�
+
+	@FXML
+	private Button bt_wy; // ��ťβҳ
+	@FXML
+	private Button bt_syy; // ��һҳ
+	@FXML
+	private Button bt_xyy;// ��һҳ
+	@FXML
+	private Button bt_sy;// ��ҳ
+	@FXML
+	private Button bt_search;
+	@FXML
+	private TableView<SumTableBean> tableView;
+
+	// ȫ���ر�
+	@FXML
+	void clossAll(ActionEvent event) {
+		frame.dispose();
+	}
+
+	String getCombText(Object comb) {
+		String textVal = "";
+		if (comb instanceof TextField) {
+			textVal = ((TextField) comb).getText();
+		} else if (comb instanceof ComboBox) {
+			SingleSelectionModel<?> selectionModel = ((ComboBox<?>) comb).getSelectionModel();
+			if (selectionModel.getSelectedIndex() >= 0) {
+				textVal = ((ComboBox<?>) comb).getSelectionModel().getSelectedItem().toString();
+			}
+		} else if (comb instanceof CheckBox) {
+			boolean selected = ((CheckBox) comb).isSelected();
+		}
+		return textVal;
+	}
+
+	private int pageNum;// ��ҳ��ʾ��ǰ�ڼ�ҳ
+	private List<List<SumTableBean>> tableBeans = new ArrayList<List<SumTableBean>>();
+
+	// ��ѯ����
+	@FXML
+	void searchAction(ActionEvent event) {
+		// ƴ�Ӳ�ѯ���
+		StringBuilder sql = new StringBuilder(
+				"select \"CODE\",\"USER\",STARTTIME,\"NUMBER\",SAPRESULT,DATASTATUS,PLMRESULT,LOGURL from CHINT_BOM_TO_SAP_SUM where 1=1");
+		String code = getCombText(tx_bh);
+		if (!code.isEmpty()) {
+			sql.append(" and \"CODE\" = '").append(code).append("'");
+		}
+		String factory = getCombText(cb_factory);
+		if (!factory.isEmpty()) {
+			sql.append(" and factory = '").append(factory).append("'");
+		}
+		String wbsno = getCombText(tx_wbs);
+		if (!wbsno.isEmpty()) {
+			sql.append(" and wbsno = '").append(wbsno).append("'");
+		}
+		String datastatus = getCombText(cb_status);
+		if (!datastatus.isEmpty()) {
+			sql.append(" and datastatus = '").append(datastatus).append("'");
+		}
+		String user = getCombText(tx_user);
+		System.out.println("user==>" + user);
+		if (!user.isEmpty()) {
+			sql.append(" and \"USER\" = '").append(user).append("'");
+		}
+		String sapresult = getCombText(cb_sapState);
+		if (!sapresult.isEmpty()) {
+			sql.append(" and sapresult = '").append(sapresult).append("'");
+		}
+		String projectno = getCombText(tx_projectName);
+		if (!projectno.isEmpty()) {
+			sql.append(" and projectno = '").append(projectno).append("'");
+		}
+		if (bt_errTask.isSelected()) {
+			sql.append(" and SAPRESULT = '����ʧ��' ");
+		}
+		ObjectProperty<LocalDateTime> dateTimeProperty = dateTimeStart.dateTimeProperty();
+		if (dateTimeProperty != null && dateTimeProperty.get() != null) {
+			String startTime = dateTimeProperty.get().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			sql.append(" and starttime >= to_date('").append(startTime).append("','yyyy-mm-ddhh24:mi:ss') "); // to_date(?,'yyyy-mm-ddhh24:mi:ss')
+			System.out.println("startTime==>" + startTime);
+		}
+		ObjectProperty<LocalDateTime> dateTimeProperty2 = dateTimeEnd.dateTimeProperty();
+		if (dateTimeProperty2 != null && dateTimeProperty2.get() != null) {
+			String endTime = dateTimeProperty2.get().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			sql.append(" and starttime <= to_date('").append(endTime).append("','yyyy-mm-ddhh24:mi:ss') "); // to_date(?,'yyyy-mm-ddhh24:mi:ss')
+			System.out.println("endTime==>" + endTime);
+		}
+
+		// ƴ��DETAILS����SQL��Ϣ
+		StringBuilder detailSql = new StringBuilder("");
+		String batchNum = getCombText(tx_batchNum);
+		if (!batchNum.isEmpty()) {
+			detailSql.append(" and batchnumber = '").append(batchNum).append("'");
+		}
+		String wbsnoDetail = getCombText(tx_wbsMx);
+		if (!wbsnoDetail.isEmpty()) {
+			detailSql.append(" and wbsno = '").append(wbsnoDetail).append("'");
+		}
+		String message = getCombText(tx_sapReturn);
+		if (!message.isEmpty()) {
+			detailSql.append(" and message like '%").append(message).append("%'");
+		}
+		String productmaterialno = getCombText(tx_pcode);
+		if (!productmaterialno.isEmpty()) {
+			detailSql.append(" and productmaterialno like '%").append(productmaterialno).append("%'");
+		}
+		String status = getCombText(tx_sapStatus);
+		if (!status.isEmpty()) {
+			if (status.equals("�ɹ�")) {
+				status = "S";
+			} else {
+				status = "E";
+			}
+			detailSql.append(" and status = '").append(status).append("'");
+		}
+
+		String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session);
+		SqlUtil.getTCDataConnection(prefs);
+		try {
+			tableBeans.clear();
+			sql.append(" order by \"CODE\" asc ");
+			System.out.println("read==>" + sql);
+			ResultSet read = SqlUtil.read(sql.toString());
+			int i = 1;
+			List<SumTableBean> beanList = null;
+			while (read.next()) {
+				// ��ҳ 20 ��ѯ����������
+				System.out.println("read==>" + read.getInt(4));
+				SumTableBean sumBean = new SumTableBean(new SimpleIntegerProperty(i),
+						new SimpleStringProperty(String.valueOf(read.getInt(1))),
+						new SimpleStringProperty(read.getString(2)), new SimpleStringProperty(read.getString(3)),
+						new SimpleStringProperty(String.valueOf(read.getInt(4))),
+						new SimpleStringProperty(read.getString(5)), new SimpleStringProperty(read.getString(6)),
+						new SimpleStringProperty(read.getString(7)), bt_errMsg.isSelected(), detailSql, prefs, code,
+						read.getString(8));
+				if (i % 20 == 1) {
+					beanList = new ArrayList<SumTableBean>();
+					tableBeans.add(beanList);
+				}
+				beanList.add(sumBean);
+				i = i + 1;
+			}
+			if (tableBeans.size() == 0) {
+				MessageBox.post("δ��ѯ�����ݼ�¼.", "��ʾ", 2);
+				beanList = new ArrayList<SumTableBean>();
+				tableBeans.add(beanList);
+			}
+			pageNum = 0;
+			System.out.println("beanList==>" + beanList.size());
+			ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(0));
+			tableView.getItems().clear();
+			tableView.setItems(data);
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			SqlUtil.freeAll();
+		}
 //    	if(bt_errMsg)
-    }
-    private SapResultFrame frame;
-    private DateTimePicker dateTimeStart;
-    private DateTimePicker dateTimeEnd;
-    protected AbstractAIFApplication app;
-    private TCSession session;
+	}
+
+	@FXML
+	private ScrollPane scrollPane;
+
+	@FXML
+	private BorderPane resultBorder;
+	@FXML
+	private BorderPane topBorder;
+	private SapResultFrame frame;
+	private DateTimePicker dateTimeStart;
+	private DateTimePicker dateTimeEnd;
+	protected AbstractAIFApplication app;
+	private TCSession session;
+
 	@Override
 	public void initData(KFXPanel paramKFXPanel) throws Exception {
 		// TODO Auto-generated method stub
-		
+
 		frame = (SapResultFrame) paramKFXPanel.getParentDialog();
-		
+		addWindListener(frame);
+		frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
+		System.out.println("frame==>" + frame);
 		this.app = AIFUtility.getCurrentApplication();
 		this.session = (TCSession) app.getSession();
 		dateTimeStart = new DateTimePicker();
@@ -288,38 +318,76 @@ public class SearchSapController extends KFXPanelController {
 		gridPane.add(dateTimeEnd, 1, 4);
 		initCombox();
 
-		//�����а�bean����
-		tc_xh.setSortable(false); 
-		tc_zrws.setSortable(false); 
-		tc_rwh.setSortable(false); 
-		tc_fqsj.setSortable(false); 
-		tc_fqr.setSortable(false); 
-		tc_status.setSortable(false); 
-		tc_log.setSortable(false); 
+		// �����а�bean����
+		tc_xh.setSortable(false);
+		tc_zrws.setSortable(false);
+		tc_rwh.setSortable(false);
+		tc_fqsj.setSortable(false);
+		tc_fqr.setSortable(false);
+		tc_status.setSortable(false);
+		tc_log.setSortable(false);
 		tc_sapState.setSortable(false);
-		tc_plm.setSortable(false); 
+		tc_plm.setSortable(false);
 		tc_result.setSortable(false);
-        //�а�bean����
-		tc_xh.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("num"));
-		tc_zrws.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("cTaskNum"));//cTaskNum
-		tc_rwh.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("taskNo"));
-		tc_fqsj.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("startTime"));
-		tc_fqr.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("user"));
+		// �а�bean����
+		tc_xh.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("num"));
+		tc_zrws.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("cTaskNum"));// cTaskNum
+		tc_rwh.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("taskNo"));
+		tc_fqsj.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("startTime"));
+		tc_fqr.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("user"));
 		tc_status.setCellValueFactory(new PropertyValueFactory<>("dataStatus"));
-		tc_log.setCellValueFactory(new PropertyValueFactory<SumTableBean,Object>("logDownload"));
-		tc_sapState.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("sapResult"));
-		tc_plm.setCellValueFactory(new PropertyValueFactory<SumTableBean,String>("plmResult"));
-		tc_result.setCellValueFactory(new PropertyValueFactory<SumTableBean,Object>("details"));
-		
+		tc_log.setCellValueFactory(new PropertyValueFactory<SumTableBean, Object>("logDownload"));
+		tc_sapState.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("sapResult"));
+		tc_plm.setCellValueFactory(new PropertyValueFactory<SumTableBean, String>("plmResult"));
+		tc_result.setCellValueFactory(new PropertyValueFactory<SumTableBean, Object>("details"));
+
+		tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.05));
+		tc_zrws.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08));
+		tc_rwh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.12));
+		tc_fqsj.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_fqr.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_status.prefWidthProperty().bind(tableView.widthProperty().multiply(0.15));
+		tc_log.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_sapState.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_plm.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+		tc_result.prefWidthProperty().bind(tableView.widthProperty().multiply(0.1));
+
 		tp_result.setCollapsible(false);
-		mxtjPane.setCollapsible(false); 
-		tp_sxtj.setCollapsible(false); 
+		mxtjPane.setCollapsible(false);
+		tp_sxtj.setCollapsible(false);
 		rwtjPane.setCollapsible(false);
-		
+
+		tc_sapState.setCellFactory(column -> {
+			return new TableCell<SumTableBean, String>() {
+				@Override
+				protected void updateItem(String item, boolean empty) {
+					super.updateItem(item, empty);
+					if (item != null && !empty && !item.isEmpty()) {
+//	                    double contrastPrice = Double.parseDouble(item);
+						if (item.equals("���")) {
+							// ������ʽ
+							setStyle("-fx-background-color: #ffff99;");
+						} else if (item.equals("����ʧ��")) {
+							setStyle("-fx-background-color: #FF6600;");
+						} else {
+							setStyle("-fx-background-color: #A9D08E;");
+						}
+
+						setText(getItem());
+						setAlignment(Pos.CENTER); // ���õ�Ԫ�����ݾ��ж���
+					} else {
+						setStyle("");
+						setText(empty ? null : getItem());
+						setAlignment(Pos.CENTER); // ���õ�Ԫ�����ݾ��ж���
+					}
+				}
+			};
+		});
+
 //		tableView.setMaxHeight(pageNum);
 	}
 
-	//��ʼ������������
+	// ��ʼ������������
 	private void initCombox() {
 		// TODO Auto-generated method stub
 		List<String> factoryList = new ArrayList<String>();
@@ -342,43 +410,117 @@ public class SearchSapController extends KFXPanelController {
 		sapStatusList.add("ʧ��");
 		tx_sapStatus.getItems().addAll(sapStatusList);
 	}
-	
-	
-	//��ת��ҳ
-    @FXML
-    void firstBtnAction(ActionEvent event) {
-    	pageNum = 0;
-    	ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(0));
+
+	// ��ת��ҳ
+	@FXML
+	void firstBtnAction(ActionEvent event) {
+		pageNum = 0;
+		ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(0));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
-    //��ת��һҳ
-    @FXML
-    void lastBtnAction(ActionEvent event) {
-    	if(pageNum>0) {
-    		pageNum = pageNum -1;
-    	}
-    	ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	}
+
+	// ��ת��һҳ
+	@FXML
+	void lastBtnAction(ActionEvent event) {
+		if (pageNum > 0) {
+			pageNum = pageNum - 1;
+		}
+		ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
-    //��ת��һҳ
-    @FXML
-    void nextBtnAction(ActionEvent event) {
-    	if(pageNum<tableBeans.size()-1) {
-    		pageNum = pageNum +1;
-    	}
-    	ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	}
+
+	// ��ת��һҳ
+	@FXML
+	void nextBtnAction(ActionEvent event) {
+		if (pageNum < tableBeans.size() - 1) {
+			pageNum = pageNum + 1;
+		}
+		ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
-    //��תβҳ
-    @FXML
-    void tailBtnAction(ActionEvent event) {
-    	pageNum = tableBeans.size()-1;
-    	ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
+	}
+
+	// ��תβҳ
+	@FXML
+	void tailBtnAction(ActionEvent event) {
+		pageNum = tableBeans.size() - 1;
+		ObservableList<SumTableBean> data = FXCollections.observableArrayList(tableBeans.get(pageNum));
 		tableView.getItems().clear();
 		tableView.setItems(data);
-    }
+	}
+
+	/**
+	 * @param frame
+	 * @function ����ҳ��ļ���
+	 */
+	private void addWindListener(SapResultFrame frame) {
+		// TODO Auto-generated method stub
+
+		frame.addComponentListener(new ComponentListener() {
+
+			@Override
+			public void componentShown(ComponentEvent e) {
+				// TODO Auto-generated method stub
+
+			}
 
+			@Override
+			public void componentResized(ComponentEvent e) {
+				// TODO Auto-generated method stub
+//				System.out.println("==============");
+				Component component = e.getComponent();
+				System.out.println("component==>" + component);
+				double width = component.getSize().getWidth();
+//				//          	double width = primaryStage.getWidth();
+				System.out.println("width==>" + width);
+				scrollPane.setPrefWidth(width * 0.98);
+				topBorder.setPrefWidth(width * 0.98);
+				tp_sxtj.setPrefWidth(width * 0.98);
+				resultBorder.setPrefWidth(width * 0.98);
+				gridPane.setPrefWidth(width * 0.98);
+				tableView.setPrefWidth(width * 0.97);
+//	          	refTable.setPrefWidth(width * 0.97);
+			}
+
+			@Override
+			public void componentMoved(ComponentEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void componentHidden(ComponentEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+	}
+
+	@FXML
+	void resetClick(ActionEvent event) {
+		tx_bh.setText("");
+		cb_sapState.getSelectionModel().clearSelection();
+		cb_factory.getSelectionModel().clearSelection();
+		tx_user.setText("");
+		tx_wbs.setText("");
+		tx_projectName.setText("");
+		tx_pcode.setText("");
+		tx_wbsMx.setText("");
+		tx_batchNum.setText("");
+		tx_sapReturn.setText("");
+		cb_status.getSelectionModel().clearSelection();
+		tx_sapStatus.getSelectionModel().clearSelection();
+		bt_errTask.setSelected(false);
+		bt_errMsg.setSelected(false);
+		dateTimeStart.clearTimeProperty();
+		dateTimeEnd.clearTimeProperty();
+	}
+
+	@FXML
+	void closeClick(ActionEvent event) {
+		frame.dispose();
+	}
 }
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
index c89bc99..2ab9c05 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
@@ -10,7 +10,7 @@
 
 <StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.DetailsController">
    <children>
-      <GridPane>
+      <GridPane fx:id="girdPane">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
@@ -20,14 +20,14 @@
             <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <FlowPane alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
+            <FlowPane fx:id="flowPane" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="200.0" style="-fx-padding: 5;">
                <children>
                   <CheckBox fx:id="cb_errBtn" mnemonicParsing="false" onAction="#errBtnAction" text="仅显示错误数据" />
                </children>
             </FlowPane>
-            <ScrollPane prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
+            <ScrollPane fx:id="scrollPane" prefHeight="1200.0" prefWidth="1200.0" style="-fx-padding: 5;" GridPane.rowIndex="1">
                <content>
-                  <TableView fx:id="tableView" prefHeight="700.0" prefWidth="1190.0" style="-fx-faint-focus-color: transparent;">
+                  <TableView fx:id="tableView" prefHeight="660.0" prefWidth="1180.0" style="-fx-faint-focus-color: transparent;">
                     <columns>
                       <TableColumn fx:id="tc_xh" prefWidth="75.0" text="序号" />
                       <TableColumn fx:id="tc_batch" prefWidth="75.0" text="批次号" />
@@ -65,7 +65,7 @@
                <right>
                   <FlowPane alignment="TOP_CENTER" prefHeight="140.0" prefWidth="589.0" BorderPane.alignment="CENTER">
                      <children>
-                        <TextField alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
+                        <TextField fx:id="pageNumTxt" alignment="TOP_RIGHT" prefHeight="30.0" prefWidth="154.0" text="1" />
                         <Label fx:id="lb_page" prefWidth="80.0" text="/" />
                         <Button mnemonicParsing="false" onAction="#outputAction" text="结果导出" />
                      </children>
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
index de0cdec..ca27f2b 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
@@ -10,9 +10,9 @@
 
 <StackPane fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1600.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.chint.plm.SearchSapResult.SearchSapController">
    <children>
-      <ScrollPane prefHeight="200.0">
+      <ScrollPane fx:id="scrollPane" prefHeight="200.0">
          <content>
-            <BorderPane prefHeight="200.0" prefWidth="200.0">
+            <BorderPane fx:id="topBorder" prefHeight="200.0" prefWidth="200.0">
                <top>
                   <TitledPane fx:id="tp_sxtj" prefHeight="650.0" text="筛选条件" BorderPane.alignment="CENTER">
                      <padding>
@@ -114,9 +114,9 @@
                                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                 </rowConstraints>
                                  <children>
-                                    <Button fx:id="bt_close" mnemonicParsing="false" text="关闭" GridPane.columnIndex="3" />
+                                    <Button fx:id="bt_close" mnemonicParsing="false" onAction="#closeClick" text="关闭" GridPane.columnIndex="3" />
                                     <Button fx:id="bt_search" mnemonicParsing="false" onAction="#searchAction" text="查询" GridPane.columnIndex="1" />
-                                    <Button fx:id="bt_czcx" mnemonicParsing="false" text="重置查询" GridPane.columnIndex="2" />
+                                    <Button fx:id="bt_czcx" mnemonicParsing="false" onAction="#resetClick" text="重置查询" GridPane.columnIndex="2" />
                                  </children>
                               </GridPane>
                            </bottom>
@@ -125,7 +125,7 @@
                   </TitledPane>
                </top>
                <center>
-                  <BorderPane prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
+                  <BorderPane fx:id="resultBorder" prefHeight="800.0" prefWidth="1200.0" BorderPane.alignment="CENTER">
                      <top>
                         <TitledPane fx:id="tp_result" prefHeight="600.0" prefWidth="200.0" text="结果" BorderPane.alignment="CENTER">
                            <padding>
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SumTableBean.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SumTableBean.java
index 0150ae9..3fdd4ac 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SumTableBean.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SumTableBean.java
@@ -138,35 +138,35 @@ public class SumTableBean {
             sqlTotal.append(this.detailSql);
             try {
             	//����BOM������Ϣ : ȫ��״̬.
-            	List<List<DetailsBean>> tableBeans = new ArrayList<List<DetailsBean>>();
-            	SqlUtil.getTCDataConnection(prefs);
-            	String sqlDetail = "";
-            	if(onlyError) {
-            		sqlDetail = sqlTotal.toString()+" and status = 'E' ";
-            	}else {
-            		sqlDetail = sqlTotal.toString()+" and status = 'S' ";
-            	}
-            	ResultSet read = SqlUtil.read(sqlDetail);
-            	int i=1;
-            	List<DetailsBean> beanList = null;
-        		while(read.next()) {
-        			//��ҳ 20  ��ѯ����������
-        			DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i),
-        					new SimpleStringProperty(read.getString(1)),new SimpleStringProperty(read.getString(2)),
-        					new SimpleStringProperty(read.getString(3)),new SimpleStringProperty(read.getString(4)),
-        					new SimpleStringProperty(read.getString(5)),new SimpleStringProperty(read.getString(6)),
-        					new SimpleStringProperty(read.getString(7)),new SimpleStringProperty(read.getString(8)),
-        					new SimpleStringProperty(read.getString(9)),new SimpleStringProperty(read.getString(10)));
-        			if(i % 20 ==1) {
-        				beanList = new ArrayList<DetailsBean>();
-        				tableBeans.add(beanList);
-        			}
-        			beanList.add(sumBean);
-        			i=i+1;
-        		}
-            	
-            	SqlUtil.freeAll();
-            	ChildMessage open  = new ChildMessage(tableBeans,this.onlyError,sqlTotal);
+//            	List<List<DetailsBean>> tableBeans = new ArrayList<List<DetailsBean>>();
+//            	SqlUtil.getTCDataConnection(prefs);
+//            	String sqlDetail = "";
+//            	if(onlyError) {
+//            		sqlDetail = sqlTotal.toString()+" and status = 'E' ";
+//            	}else {
+//            		sqlDetail = sqlTotal.toString()+" and status = 'S' ";
+//            	}
+//            	ResultSet read = SqlUtil.read(sqlDetail);
+//            	int i=1;
+//            	List<DetailsBean> beanList = null;
+//        		while(read.next()) {
+//        			//��ҳ 20  ��ѯ����������
+//        			DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i),
+//        					new SimpleStringProperty(read.getString(1)),new SimpleStringProperty(read.getString(2)),
+//        					new SimpleStringProperty(read.getString(3)),new SimpleStringProperty(read.getString(4)),
+//        					new SimpleStringProperty(read.getString(5)),new SimpleStringProperty(read.getString(6)),
+//        					new SimpleStringProperty(read.getString(7)),new SimpleStringProperty(read.getString(8)),
+//        					new SimpleStringProperty(read.getString(9)),new SimpleStringProperty(read.getString(10)));
+//        			if(i % 20 ==1) {
+//        				beanList = new ArrayList<DetailsBean>();
+//        				tableBeans.add(beanList);
+//        			}
+//        			beanList.add(sumBean);
+//        			i=i+1;
+//        		}
+//            	
+//            	SqlUtil.freeAll();
+            	ChildMessage open  = new ChildMessage(this.onlyError,sqlTotal);
                 open.start(new Stage());
             }catch(Exception ex){
             	ex.printStackTrace();