Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r20551 -r20588
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20551)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20588)
@@ -46,7 +46,7 @@
 		Utils.driver.get(Utils.settings.get("服务器地址").toString()
 				+ "/?logonType=1080p");
 		login.loginAction();
-		//调试用 
+		// 调试用
 		// login.login_secondSupplyRoom(false);
 		// 等待跳转到回收界面
 		Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
@@ -835,67 +835,82 @@
 	public void recyle_Foreign_Twice() {
 		try {
 			Utils.retryingFindAndClick(By.id("appTypeSelect"));
-			Utils.retryingFindAndClick(By.cssSelector("option[value='(待回收)外来器械包申请单']"));
+			Utils.retryingFindAndClick(By
+					.cssSelector("option[value='(待回收)外来器械包申请单']"));
 			String a = Utils.settings.getJSONObject("临床科室").getString("条码");
-			// 输入临床科室条码，只显示临床科室的申请单
-			Utils.retryingFindAndSendKeys(By.tagName("body"), a + "\n");
-			WebElement element = Utils.retryingFind(By.id("tousseItemTable"));
-
+			WebElement element = Utils.retryingFind(By
+					.id("awaitForRecycleTable"));
 			if (Utils.isFind(element)) {
-			} else {
+				List<WebElement> allRows = element.findElements(By
+						.tagName("tr"));
+				System.out.println("rows size = " + allRows.size());
+				if (allRows.size() > 1) {
+					// 输入临床科室条码，只显示临床科室的申请单
+					Utils.retryingFindAndSendKeys(By.tagName("body"), a + "\n");
+					if (Utils.isFind(Utils.retryingFind(By
+							.id("tousseItemTable")))) {
+					} else {
+						Utils.retryingFindClickFirstCellOfTable(By
+								.id("awaitForRecycleTable"));
+						waitUrlChange();
+					}
+					// 获取器械包的器械（材料）清单表格
+					WebElement tousseItemTable = this.scanRecycleUserBarcode();
+					Utils.retryingFindAndClick(By.id("add-QM"));
+					Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
+					Utils.retryingFindAndClick(By.id("remark"));
+					Utils.retryingFindAndSendKeys(By.id("remark"), "回收添加质量监测");
+					Utils.retryingFindAndClick(By.id("saveBtn"));
+					Utils.driver.switchTo().defaultContent();
+					tousseItemTable.sendKeys(Utils.settings.getJSONObject(
+							"一级供应室清洗篮筐1").getString("条码")
+							+ "\n");
+					dialogWindowClose();
+					Utils.retryingFindAndClick(By.id("showTousseName0"));
+					Utils.driver.switchTo().defaultContent();
+					Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
+					if (Utils.retryingFind(By.id("includeImplant1")).getText() == "否") {
+						Utils.retryingFindAndClick(By.id("includeImplant1"));
+					}
+					if (Utils.isFind(Utils.retryingFind(By
+							.id("usedAmountOfIncludeImplant1")))) {
+						Utils.retryingFindAndClick(By
+								.id("usedAmountOfIncludeImplant1"));
+						Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
 
-				Utils.retryingFindClickFirstCellOfTable(By
-						.id("awaitForRecycleTable"));
-				waitUrlChange();
+						a = (int) (Math.random() * 8 + 1) + "";
+						Utils.retryingFindAndClick(By.id("button" + a));
+						Utils.retryingFindAndClick(By.id("okButton"));
 
-			}
-			// 获取器械包的器械（材料）清单表格
-			WebElement tousseItemTable = this.scanRecycleUserBarcode();
-			Utils.retryingFindAndClick(By.id("add-QM"));
-			Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
-			Utils.retryingFindAndClick(By.id("remark"));
-			Utils.retryingFindAndSendKeys(By.id("remark"), "回收添加质量监测");
-			Utils.retryingFindAndClick(By.id("saveBtn"));
-			Utils.driver.switchTo().defaultContent();
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1")
-					.getString("条码") + "\n");
-			dialogWindowClose();
-			Utils.retryingFindAndClick(By.id("showTousseName0"));
-			Utils.driver.switchTo().defaultContent();
-			Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
-			if (Utils.retryingFind(By.id("includeImplant1")).getText() == "否") {
-				Utils.retryingFindAndClick(By.id("includeImplant1"));
-			}
-			if (Utils.isFind(Utils.retryingFind(By
-					.id("usedAmountOfIncludeImplant1")))) {
-				Utils.retryingFindAndClick(By.id("usedAmountOfIncludeImplant1"));
-				Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
+						Utils.driver.switchTo().defaultContent();
+						Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
 
-				a = (int) (Math.random() * 8 + 1) + "";
-				Utils.retryingFindAndClick(By.id("button" + a));
-				Utils.retryingFindAndClick(By.id("okButton"));
+						Utils.retryingFindAndClick(By
+								.id("ftDefinitionSubmitButton"));
 
-				Utils.driver.switchTo().defaultContent();
-				Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
+						Wait<WebDriver> wait = WaitFactory.createDefaultWait();
+						wait.until(ExpectedConditions.alertIsPresent());
 
-				Utils.retryingFindAndClick(By.id("ftDefinitionSubmitButton"));
-
-				Wait<WebDriver> wait = WaitFactory.createDefaultWait();
-				wait.until(ExpectedConditions.alertIsPresent());
-
-				Alert alertBox = Utils.driver.switchTo().alert();
-				alertBox.accept();
+						Alert alertBox = Utils.driver.switchTo().alert();
+						alertBox.accept();
+					}
+					String recyclingFormWindowhandle = Utils.driver
+							.getWindowHandle();
+					Utils.driver.switchTo().window(recyclingFormWindowhandle);
+					tousseItemTable = Utils.retryingFind(By
+							.id("tousseItemTable"));
+					List<WebElement> addButtons = tousseItemTable
+							.findElements(By.cssSelector(".btn-a"));
+					for (WebElement addButton : addButtons) {
+						addButton.click();
+					}
+					Utils.retryingFindAndClick(By.id("saveBtn"));
+				} else {
+					System.out.println("没有待归还的外来器械");
+				}
+			} else {
+				System.out.println("没有待归还的外来器械");
 			}
-			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(recyclingFormWindowhandle);
-			tousseItemTable = Utils.retryingFind(By.id("tousseItemTable"));
-			List<WebElement> addButtons = tousseItemTable.findElements(By
-					.cssSelector(".btn-a"));
-			for (WebElement addButton : addButtons) {
-				addButton.click();
-
-			}
-			Utils.retryingFindAndClick(By.id("saveBtn"));
 		} catch (Exception e) {
 			System.out.println("异常信息：");
 			e.printStackTrace();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
===================================================================
diff -u -r20261 -r20588
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java	(.../Apply.java)	(revision 20261)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java	(.../Apply.java)	(revision 20588)
@@ -700,14 +700,17 @@
 					.xpath("//div/a/span[contains(text(), '外来器械包申请')]"));
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
 			JSWaiter.waitUntilJQueryReady();
-			Utils.retryingFindAndClick(By
-					.xpath("//div/p[contains(text(), '已接收')]"));
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '批量提前归还')]"));
-			String currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.xpath("//div/p[contains(text(), '已接收')]")))) {
+				Utils.retryingFindAndClick(By
+						.xpath("//div/p[contains(text(), '已接收')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '批量提前归还')]"));
+				String currentwindowhandle = Utils.driver.getWindowHandle();
+				Utils.driver.switchTo().window(currentwindowhandle);
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '是')]"));
+			}
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -734,16 +737,18 @@
 					.xpath("//div/a/span[contains(text(), '外来器械包申请')]"));
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
 			JSWaiter.waitUntilJQueryReady();
-			Utils.retryingFindAndClick(By
-					.xpath("//div/p[contains(text(), '已回收')]"));
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '批量确认归还')]"));
-			String currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.xpath("//div/p[contains(text(), '已回收')]")))) {
+				Utils.retryingFindAndClick(By
+						.xpath("//div/p[contains(text(), '已回收')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '批量确认归还')]"));
+				String currentwindowhandle = Utils.driver.getWindowHandle();
+				Utils.driver.switchTo().window(currentwindowhandle);
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '是')]"));
+			}
 			JSWaiter.waitUntilJQueryReady();
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			Assert.fail(e.getMessage());
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r20551 -r20588
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20551)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20588)
@@ -819,6 +819,7 @@
 			}
 			else
 			{
+				scan();
 				String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
 				WebElement element = Utils.retryingFind(By
 						.id("sterilingType-triggerWrap"));
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r20573 -r20588
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20573)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20588)
@@ -183,6 +183,7 @@
 			Actions moveover = new Actions(Utils.driver);
 			moveover.moveToElement(Utils.retryingFind(By.id("reviewPacking")))
 					.perform();
+			Utils.retryingFindAndHover(By.id("reviewPacking"));
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("二级供应室装配组").getString("名称1")));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking"));