Merge branch 'master' of http://yunpi.tpddns.cn:3000/ZT_CODE/com.connor.chint.wuhan

com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java

@@ -611,6 +611,36 @@ public class CreateEcnController extends KFXPanelController {
     			btn.setSelected(true);
     		}
     	}
+    	
+    	try {
+    		SqlUtil.getTCDataConnection(database);
+    		ObservableList<RefTableBean> items = refTable.getItems();
+    		int i=0;
+    		String refTableSql = "select * from CHINT_ECN_NOTIFICATION where \"ecncode\" = '"+ecnId.getText()+"' order by \"code\" asc , \"no\" asc ";
+    		System.out.println("refTableSql==>"+refTableSql);
+    		ResultSet read = SqlUtil.read(refTableSql);
+    		while(read.next()) {
+//    			\"result\",\"principal\",\"pctime\",\"remark\"
+    			RefTableBean refTableBean = items.get(i);
+    			refTableBean.setCompDate(read.getString("pctime"));
+    			refTableBean.setMark(read.getString("remark"));
+    			refTableBean.setUser(read.getString("principal"));
+    			String result = read.getString("result");
+    			System.out.println("refTableSql==>"+read.getString("principal"));
+    			if(result.equals("·ñ")) {
+    				refTableBean.setShNo(false);
+    			}
+    			i=i+1;
+    		}
+    		refTable.setItems(items);
+//    		if()
+//    		refTable.getItems().clear();
+//    		refTable.getItems().addAll(items);
+    	}catch(Exception e) {
+    		e.printStackTrace();
+    	}finally {
+    		SqlUtil.freeAll();
+    	}
 	}
     /*
      * 
@@ -827,35 +857,7 @@ public class CreateEcnController extends KFXPanelController {
     	
     	refTable.getItems().addAll(refTableBeans);
     	
-    	try {
-    		SqlUtil.getTCDataConnection(database);
-    		ObservableList<RefTableBean> items = refTable.getItems();
-    		int i=0;
-    		String refTableSql = "select * from CHINT_ECN_NOTIFICATION where \"ecncode\" = '"+ecnId.getText()+"' order by \"code\" asc , \"no\" asc ";
-    		System.out.println("refTableSql==>"+refTableSql);
-    		ResultSet read = SqlUtil.read(refTableSql);
-    		while(read.next()) {
-//    			\"result\",\"principal\",\"pctime\",\"remark\"
-    			RefTableBean refTableBean = items.get(i);
-    			refTableBean.setCompDate(read.getString("pctime"));
-    			refTableBean.setMark(read.getString("remark"));
-    			refTableBean.setUser(read.getString("principal"));
-    			String result = read.getString("result");
-    			System.out.println("refTableSql==>"+read.getString("principal"));
-    			if(result.equals("·ñ")) {
-    				refTableBean.setShNo(false);
-    			}
-    			i=i+1;
-    		}
-    		refTable.setItems(items);
-//    		if()
-//    		refTable.getItems().clear();
-//    		refTable.getItems().addAll(items);
-    	}catch(Exception e) {
-    		e.printStackTrace();
-    	}finally {
-    		SqlUtil.freeAll();
-    	}
+    	
 	}
 	//最大化
 	/**