Index: ssts-selenium-test/src/test/java/test_4_1/Recyle.java
===================================================================
diff -u -r17697 -r17698
--- ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17697)
+++ ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17698)
@@ -181,39 +181,35 @@
 			}
 			if (displayed) {
 
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
 				}
 			}
 
-			Utils.retryingFind(By.linkText("添加器械包")).click();
+			Utils.retryingFindAndClick(By.linkText("添加器械包"));
 			Utils.driver.switchTo().defaultContent();
-			WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
-			Utils.retryingFind(
-					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")))
-					.click();
+			Utils.retryingFindAndClick(
+					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")));
 
-			Utils.retryingFind(
-					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")))
-					.click();
+			Utils.retryingFindAndClick(
+					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")));
 
-			Utils.retryingFind(
+			Utils.retryingFindAndClick(
 					By.linkText(Utils.settings.getJSONObject("一级供应室器械包2")
-							.getString("名称"))).click();
+							.getString("名称")));
 
 			recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 
 			List<WebElement> addButtons = tousseItemTable.findElements(By
 					.cssSelector(".btn-a"));
-			Utils.retryingFind(
-					By.xpath("//tbody/tr/td/a[contains(text(), '+')]")).click();
+			Utils.retryingFindAndClick(
+					By.xpath("//tbody/tr/td/a[contains(text(), '+')]"));
 			for (WebElement addButton : addButtons) {
 				addButton.click();
 
@@ -229,9 +225,8 @@
 			}
 			if (displayed) {
 
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
@@ -241,7 +236,7 @@
 			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室器械包1")
 					.getString("标识牌条码1") + "\n");
 
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
@@ -260,9 +255,10 @@
 	public void recyle_customSet() {
 		try {
 			boolean displayed = false;
-			WebElement bodyElement = Utils.retryingFind(By.tagName("body"));
+			
 			// 输入临床科室条码，只显示临床科室的申请单
-			bodyElement.sendKeys(Utils.settings.getJSONObject("临床科室")
+			WebElement bodyElement = Utils.retryingFindAndSendKeys(By.tagName("body"),
+					Utils.settings.getJSONObject("临床科室")
 					.getString("条码") + "\n");
 
 			// displayed = Utils.retryingFindClickFirstCellOfTable(By
@@ -302,9 +298,8 @@
 			}
 			if (displayed) {
 
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
@@ -364,14 +359,16 @@
 				// 点击回收数量输入框
 				Utils.retryingFind(By.id("recycleAmount" + index)).click();
 				// 弹出了数量输入的对话框
-				WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-				Utils.driver.switchTo().frame(frame);
-				Utils.retryingFind(By.linkText("1")).click();
-				Utils.retryingFind(By.cssSelector(".btn-a")).click();
+				
+				
+				WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+				
+				Utils.retryingFindAndClick(By.linkText("1"));
+				Utils.retryingFindAndClick(By.cssSelector(".btn-a"));
 				Utils.driver.switchTo().defaultContent();
 				addButton.click();
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
@@ -411,7 +408,7 @@
 			for (WebElement addButton : addButtons) {
 				addButton.click();
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
@@ -474,7 +471,7 @@
 				addButton.click();
 
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
@@ -490,25 +487,22 @@
 	@Test
 	public void recyle_recyleAndDropAndScrap() {
 		try {
-			Utils.retryingFind(By.linkText("添加")).click();
+			Utils.retryingFindAndClick(By.linkText("添加"));
 
-			Utils.retryingFind(By.linkText("添加器械包")).click();
+			Utils.retryingFindAndClick(By.linkText("添加器械包"));
 			Utils.driver.switchTo().defaultContent();
-			WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
-			Utils.retryingFind(
-					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮1")))
-					.click();
+			Utils.retryingFindAndClick(
+					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮1")));
 
-			Utils.retryingFind(
-					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")))
-					.click();
+			Utils.retryingFindAndClick(
+					By.id(Utils.settings.getJSONObject("回收查询").getString("按钮2")));
 
-			WebElement findElement = Utils.retryingFind(By
+			WebElement findElement = Utils.retryingFindAndClick(By
 					.linkText(Utils.settings.getJSONObject("一级供应室器械包1")
 							.getString("名称")));
-			findElement.click();
 
 			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
@@ -539,39 +533,38 @@
 					.cssSelector(".btn-a"));
 			for (WebElement addButton : addButtons) {
 
-				Utils.retryingFind(By.cssSelector(".btn-b")).click();
-				frame = Utils.retryingFind(By.id("xubox_iframe"));
-				Utils.driver.switchTo().frame(frame);
+				Utils.retryingFindAndClick(By.cssSelector(".btn-b"));
+				
+				
+				frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
-				Utils.retryingFind(By.id("recyclingErrorTable")).click();
-				Utils.retryingFind(
-						By.xpath("//tbody/tr/td/a[contains(text(), '+')]"))
-						.click();
-				Utils.retryingFind(
-						By.xpath("//tbody/tr/td/a[contains(text(), '确定')]"))
-						.click();
+				Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
+				Utils.retryingFindAndClick(
+						By.xpath("//tbody/tr/td/a[contains(text(), '+')]"));
+				Utils.retryingFindAndClick(
+						By.xpath("//tbody/tr/td/a[contains(text(), '确定')]"));
 				Utils.driver.switchTo().defaultContent();
-				Utils.retryingFind(By.cssSelector(".btn-c")).click();
-				frame = Utils.retryingFind(By.id("xubox_iframe"));
-				Utils.driver.switchTo().frame(frame);
-				Utils.retryingFind(By.id("recyclingDamageForm")).click();
-				Utils.retryingFind(By.cssSelector("a[class=add]")).click();
-				Utils.retryingFind(
-						By.xpath("//tbody/tr/td/a[contains(text(), '确定')]"))
-						.click();
+				
+				Utils.retryingFindAndClick(By.cssSelector(".btn-c"));
+				frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+				
+				Utils.retryingFindAndClick(By.id("recyclingDamageForm"));
+				Utils.retryingFindAndClick(By.cssSelector("a[class=add]"));
+				Utils.retryingFindAndClick(
+						By.xpath("//tbody/tr/td/a[contains(text(), '确定')]"));
 				Utils.driver.switchTo().defaultContent();
 				addButton.click();
 			}
-			Utils.retryingFind(By.cssSelector(".divStyle")).click();
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.id("recyclingErrorTable")).click();
-			Utils.retryingFind(
-					By.xpath("//tbody/tr/td/a[contains(text(), '+')]")).click();
-			Utils.retryingFind(By.cssSelector("a[class='submit']")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".divStyle"));
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
+			Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
+			Utils.retryingFindAndClick(
+					By.xpath("//tbody/tr/td/a[contains(text(), '+')]"));
+			Utils.retryingFindAndClick(By.cssSelector("a[class='submit']"));
 			Utils.driver.switchTo().defaultContent();
 
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -619,9 +612,8 @@
 			}
 			if (displayed) {
 
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
@@ -642,8 +634,9 @@
 					By.xpath("//tbody/tr/td/a[contains(text(), '确定')]"));
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndClick(By.cssSelector(".btn-c"));
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
 			Utils.retryingFindAndClick(By.id("recyclingDamageForm"));
 			Utils.retryingFindAndClick(By.cssSelector("a[class=add]"));
 			Utils.retryingFindAndClick(
@@ -652,8 +645,7 @@
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndClick(By.cssSelector(".divStyle"));
 			
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 			
 			Utils.retryingFindAndClick(By.id("recyclingErrorTable"));
 			Utils.retryingFindAndClick(
@@ -671,9 +663,8 @@
 			}
 			if (displayed) {
 
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
 				}
@@ -696,28 +687,26 @@
 		try {
 			Utils.retryingFind(By.id("enterpriseView")).click();
 
-			WebElement frame = Utils.retryingFind(By
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By
 					.id("iframe_enterpriseView"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(
-					By.xpath("//div/a/span[contains(text(), '回收清点')]")).click();
-			Utils.retryingFind(By.cssSelector("a[target='mainFrame']")).click();
+			
+			Utils.retryingFindAndClick(
+					By.xpath("//div/a/span[contains(text(), '回收清点')]"));
+			Utils.retryingFindAndClick(By.cssSelector("a[target='mainFrame']"));
 
-			frame = Utils.retryingFind(By.id("mainFrame"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(
-					By.xpath("//tbody/tr/td/div[contains(text(), '待接收')]"))
-					.click();
-			Utils.retryingFind(By.id("editTbar")).click();
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
+
+			Utils.retryingFindAndClick(
+					By.xpath("//tbody/tr/td/div[contains(text(), '待接收')]"));
+			Utils.retryingFindAndClick(By.id("editTbar"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFind(By.cssSelector("input[name='basketBarcode']"))
-					.sendKeys(
+			
+			Utils.retryingFindAndSendKeys(By.cssSelector("input[name='basketBarcode']"),
 							Utils.settings.getJSONObject("二级供应室清洗篮筐1")
 									.getString("条码") + "\n");
 
-			Utils.retryingFind(By.xpath("//span[contains(text(), '确认接收')]"))
-					.click();
+			Utils.retryingFindAndClick(By.xpath("//span[contains(text(), '确认接收')]"));
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -770,26 +759,27 @@
 			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐4")
 					.getString("条码") + "\n");
 
-			Utils.retryingFind(By.id("showTousseName0")).click();
+			Utils.retryingFindAndClick(By.id("showTousseName0"));
 			Utils.driver.switchTo().defaultContent();
-			WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.id("includeImplant1")).click();
+			
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
+			Utils.retryingFindAndClick(By.id("includeImplant1"));
 
-			Utils.retryingFind(By.id("amount1")).click();
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			Utils.retryingFindAndClick(By.id("amount1"));
+			
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
 			String x = (int) (Math.random() * 8 + 1) + "";
-			Utils.retryingFind(By.linkText(x)).click();
+			Utils.retryingFindAndClick(By.linkText(x));
 
-			Utils.retryingFind(By.linkText("6")).click();
-			Utils.retryingFind(By.cssSelector(".btn-a")).click();
+			Utils.retryingFindAndClick(By.linkText("6"));
+			Utils.retryingFindAndClick(By.cssSelector(".btn-a"));
 
 			Utils.driver.switchTo().defaultContent();
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.cssSelector("a[class='submit']")).click();
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
+			Utils.retryingFindAndClick(By.cssSelector("a[class='submit']"));
 
 			wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -808,7 +798,7 @@
 				addButton.click();
 
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 			Thread.sleep(1500);
 		} catch (Exception e) {
 			System.out.println("异常信息：");
@@ -855,32 +845,32 @@
 				displayed = element.isDisplayed();
 			}
 			if (displayed) {
-				Utils.retryingFind(
-						By.xpath("//div/div/button/span[contains(text(), '是')]"))
-						.click();
+				Utils.retryingFindAndClick(
+						By.xpath("//div/div/button/span[contains(text(), '是')]"));
 
 				for (String winHandle : Utils.driver.getWindowHandles()) {
 					Utils.driver.switchTo().window(winHandle);
 				}
 			}
-			Utils.retryingFind(By.id("showTousseName0")).click();
+			Utils.retryingFindAndClick(By.id("showTousseName0"));
 			Utils.driver.switchTo().defaultContent();
-			WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.id("amount1")).click();
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
+			Utils.retryingFindAndClick(By.id("amount1"));
+			
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
 
 			String x = (int) (Math.random() * 8 + 1) + "";
-			Utils.retryingFind(By.linkText(x)).click();
+			Utils.retryingFindAndClick(By.linkText(x));
 
-			Utils.retryingFind(By.linkText("5")).click();
-			Utils.retryingFind(By.cssSelector(".btn-a")).click();
+			Utils.retryingFindAndClick(By.linkText("5"));
+			Utils.retryingFindAndClick(By.cssSelector(".btn-a"));
 
 			Utils.driver.switchTo().defaultContent();
-			frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.cssSelector("a[class='submit']")).click();
+			frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			
+			
+			Utils.retryingFindAndClick(By.cssSelector("a[class='submit']"));
 			wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
 					.pollingEvery(250, TimeUnit.MILLISECONDS)
@@ -897,7 +887,7 @@
 				addButton.click();
 
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -912,24 +902,22 @@
 	public void recyle_change() {
 		Actions action = new Actions(Utils.driver);
 		action.click(Utils.retryingFind(By.id("depart"))).perform();
-		WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-		Utils.driver.switchTo().frame(frame);
-		Utils.retryingFind(By.id("buttonX")).click();
+		WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+
+		Utils.retryingFindAndClick(By.id("buttonX"));
 		String name = Utils.settings.getJSONObject("临床科室").getString("名称");
-		Utils.retryingFind(
-				By.xpath("//div/ul/li/a[contains(text(), '" + name + "')]"))
-				.click();
+		Utils.retryingFindAndClick(
+				By.xpath("//div/ul/li/a[contains(text(), '" + name + "')]"));
 		String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 		Utils.driver.switchTo().window(recyclingFormWindowhandle);
-		Utils.retryingFind(By.id("applicationType")).click();
-		frame = Utils.retryingFind(By.id("xubox_iframe"));
-		Utils.driver.switchTo().frame(frame);
-		Utils.retryingFind(By.xpath("//div/ul/li/a[contains(text(), '通用申请单')]"))
-				.click();
+		Utils.retryingFindAndClick(By.id("applicationType"));
+		frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+		
+		Utils.retryingFindAndClick(By.xpath("//div/ul/li/a[contains(text(), '通用申请单')]"));
 		recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 		Utils.driver.switchTo().window(recyclingFormWindowhandle);
-		Utils.retryingFind(By.id("recyclingRecordTable")).click();
-		Utils.retryingFind(By.xpath("//i/a[contains(text(), '删除')]")).click();
+		Utils.retryingFindAndClick(By.id("recyclingRecordTable"));
+		Utils.retryingFindAndClick(By.xpath("//i/a[contains(text(), '删除')]"));
 		Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 				.withTimeout(5000, TimeUnit.MILLISECONDS)
 				.pollingEvery(250, TimeUnit.MILLISECONDS)
@@ -947,7 +935,7 @@
 		for (WebElement addButton : addButtons) {
 			addButton.click();
 		}
-		Utils.retryingFind(By.cssSelector(".btn-e")).click();
+		Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 	}
 
 	/**
@@ -957,7 +945,7 @@
 	public void recyle_quickly() {
 		try {
 
-			Utils.retryingFind(By.xpath("//body/div[1]/div[2]/img[2]")).click();
+			Utils.retryingFindAndClick(By.xpath("//body/div[1]/div[2]/img[2]"));
 
 			Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -976,15 +964,15 @@
 			for (WebElement addButton : addButtons) {
 				addButton.click();
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
 
 			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
-			Utils.retryingFind(By.cssSelector(".btn-d")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-d"));
 			wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
 					.pollingEvery(250, TimeUnit.MILLISECONDS)
@@ -1006,18 +994,17 @@
 		try {
 			WebElement bodyElement = Utils.retryingFind(By.tagName("body"));
 
-			Utils.retryingFind(By.id("state")).click();
+			Utils.retryingFindAndClick(By.id("state"));
 
-			WebElement frame = Utils.retryingFind(By.id("xubox_iframe"));
-			Utils.driver.switchTo().frame(frame);
-			Utils.retryingFind(By.linkText("未确认")).click();
+			WebElement frame = Utils.retryingFindAndSwitchToFrame(By.id("xubox_iframe"));
+			Utils.retryingFindAndClick(By.linkText("未确认"));
 
 			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 
-			Utils.retryingFind(By.id("recyclingRecordTable")).click();
+			Utils.retryingFindAndClick(By.id("recyclingRecordTable"));
 
-			Utils.retryingFind(By.id("confirmBtnTd")).click();
+			Utils.retryingFindAndClick(By.id("confirmBtnTd"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1035,12 +1022,12 @@
 
 			Utils.retryingFind(By.id("recyclingRecordTable"));
 
-			Utils.retryingFind(By.cssSelector("tr[bgcolor='#FF8C69']")).click();
+			Utils.retryingFindAndClick(By.cssSelector("tr[bgcolor='#FF8C69']"));
 
 			Utils.retryingFindClickFirstCellOfTable(By
 					.id("recyclingRecordTable"));
 
-			Utils.retryingFind(By.id("confirmBtnTd")).click();
+			Utils.retryingFindAndClick(By.id("confirmBtnTd"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1089,13 +1076,13 @@
 				addButton.click();
 
 			}
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
 
-			Utils.retryingFind(By.cssSelector(".btn-e")).click();
+			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-selenium-test/src/test/java/test_4_1/Assemble.java
===================================================================
diff -u -r17694 -r17698
--- ssts-selenium-test/src/test/java/test_4_1/Assemble.java	(.../Assemble.java)	(revision 17694)
+++ ssts-selenium-test/src/test/java/test_4_1/Assemble.java	(.../Assemble.java)	(revision 17698)
@@ -145,35 +145,29 @@
 		try {
 			scan();
 
-			Utils.retryingFind(
-					By.cssSelector("input[name='basketBarcodeInput']"))
-					.sendKeys(
+			Utils.retryingFindAndSendKeys(
+					By.cssSelector("input[name='basketBarcodeInput']"),
 							Utils.settings.getJSONObject("一级供应室清洗篮筐4")
 									.getString("条码") + "\n");
 
-			Actions click = new Actions(Utils.driver);
-			Utils.retryingFind(By.id("checkAllTaskNode-inputRow")).click();
+			Utils.retryingFindAndClick(By.id("checkAllTaskNode-inputRow"));
 			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
 			WebElement element = Utils.retryingFind(By
 					.id("sterilingType-triggerWrap"));
 			if (element != null) {
 				displayed = element.isDisplayed();
 				if (displayed) {
 					element.click();
-					click.click(
-							Utils.retryingFind(By
-									.xpath("//div/ul/li[contains(text(), '"
-											+ name + "')]"))).perform();
+					Utils.retryingFindAndClick(By
+							.xpath("//div/ul/li[contains(text(), '" + name
+									+ "')]"));
 				}
 			}
-			click.click(Utils.retryingFind(By.id("packageType-triggerWrap")))
-					.perform();
+			Utils.retryingFindAndClick(By.id("packageType-triggerWrap"));
 
 			name = Utils.settings.getJSONObject("包装类型").getString("名称1");
-			click.click(
-					Utils.retryingFind(By
-							.xpath("//div/ul/li[contains(text(), '" + name
-									+ "')]"))).perform();
+			Utils.retryingFindAndClick(By
+					.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
 
 			Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
@@ -183,7 +177,7 @@
 
 			Alert alertBox = Utils.driver.switchTo().alert();
 			alertBox.accept();
-			Utils.retryingFind(By.id("save_print")).click();
+			Utils.retryingFindAndClick(By.id("save_print"));
 			/** 获取装配成功后的条码 **/
 			Utils.barcodes = Utils.getToussesBarcodes();
 			System.out.println("本次装配条码：" + Utils.barcodes);