Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
===================================================================
diff -u -r20249 -r20276
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java	(.../Delivery.java)	(revision 20249)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java	(.../Delivery.java)	(revision 20276)
@@ -419,13 +419,14 @@
 					.xpath("//div/a/span[contains(text(), '发货管理')]"));
 			Utils.retryingFindAndClick(By
 					.xpath("//div/a/span[contains(text(), '材料发货管理')]"));
-
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
 			Utils.retryingFindAndClick(By
 					.xpath("//button[contains(text(), '添加')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			if (Utils.isFind(Utils.retryingFind(By.id("departSearch")))) {
+			if (Utils.isFind(Utils.retryingFind(By.id("materialInvoiceForm")))) {
+				Utils.retryingFindAndClick(By.id("materialInvoiceForm"));
+				Utils.retryingFindAndClick(By.id("departSearch"));
 				Utils.retryingFindAndSendKeys(By.id("departSearch"), Keys.DOWN);
 				String name = Utils.settings.getJSONObject("临床科室").getString(
 						"名称");
@@ -434,7 +435,8 @@
 								+ "')]"));
 				Wait<WebDriver> wait = WaitFactory.createDefaultWait();
 				wait.until(ExpectedConditions.attributeToBeNotEmpty(
-						Utils.driver.findElement(By.id("departSearch")), "value"));
+						Utils.driver.findElement(By.id("departSearch")),
+						"value"));
 				Utils.retryingFindAndSendKeys(By.id("name1"), Utils.settings
 						.getJSONObject("一级供应室材料").getString("拼音码"));
 
@@ -445,9 +447,10 @@
 				 * Utils.driver.switchTo().window(winHandle); }
 				 * Utils.retryingFindAndClick(By.id("materialInvoiceForm"));
 				 * 
-				 * Utils.waitUntilUrlChange(Utils.settings.get("服务器地址").toString
-				 * () + "disinfectsystem/invoice/selectUserecordWindowView.jsp",
-				 * 15); name =
+				 * Utils.waitUntilUrlChange(Utils.settings.get("服务器地址").
+				 * toString () +
+				 * "disinfectsystem/invoice/selectUserecordWindowView.jsp", 15);
+				 * name =
 				 * Utils.settings.getJSONObject("临床科室用户").getString("姓名");
 				 * Utils.retryingFindAndClick(By
 				 * .xpath("//tbody/tr/td/div[contains(text(), '" + name +
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r20261 -r20276
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20261)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20276)
@@ -375,31 +375,30 @@
 	@Test
 	public void recyle_return() {
 		try {
-			// 获取body对象，sendKeys更加可靠。actions.click()的方式在win10,IE11下不可靠
-			// 输入临床科室条码，只显示临床科室的申请单
-			Utils.retryingFindAndSendKeys(By.tagName("body"), Utils.settings
-					.getJSONObject("临床科室").getString("条码") + "\n");
+			if (Utils.isFind(Utils.retryingFind(By
+					.cssSelector("td[bgcolor='yellow']")))) {
+				Utils.retryingFindAndHover(By
+						.cssSelector("td[bgcolor='yellow']"));
+				Utils.retryingFindAndClick(By
+						.cssSelector("td[bgcolor='yellow']"));
+				waitUrlChange();
+				String recyclingFormWindowhandle = Utils.driver
+						.getWindowHandle();
+				Utils.driver.switchTo().window(recyclingFormWindowhandle);
+				WebElement tousseItemTable = this.scanRecycleUserBarcode();
+				tousseItemTable.sendKeys(Utils.settings.getJSONObject(
+						"一级供应室清洗篮筐3").getString("条码")
+						+ "\n");
+				// 根据cssClass获取入筐按钮集合
+				tousseItemTable = Utils.retryingFind(By.id("tousseItemTable"));
+				List<WebElement> addButtons = tousseItemTable.findElements(By
+						.cssSelector(".btn-a"));
+				for (WebElement addButton : addButtons) {
+					addButton.click();
 
-			Utils.retryingFindClickFirstCellOfTable(By
-					.id("awaitForRecycleTable"));
-
-			waitUrlChange();
-
-			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(recyclingFormWindowhandle);
-			WebElement tousseItemTable = scanRecycleUserBarcode();
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐3")
-					.getString("条码") + "\n");
-			// 根据cssClass获取入筐按钮集合
-			List<WebElement> addButtons = tousseItemTable.findElements(By
-					.cssSelector(".btn-a"));
-
-			for (WebElement addButton : addButtons) {
-				addButton.click();
-
+				}
+				Utils.retryingFindAndClick(By.id("saveBtn"));
 			}
-			Utils.retryingFindAndClick(By.id("saveBtn"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -785,7 +784,7 @@
 	}
 
 	/**
-	 * 外来器械二次回收
+	 * 外来器械二次回收及增加回收的质量监测
 	 * */
 	@Test
 	public void recyle_Foreign_Twice() {
@@ -805,12 +804,17 @@
 			}
 			// 获取器械包的器械（材料）清单表格
 			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");
 
 			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"));
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r20261 -r20276
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20261)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20276)
@@ -75,7 +75,7 @@
 			logger.info("申请流程结束..........");
 			JSWaiter.waitUntilJQueryReady();
 			login.login_Out();
-
+			
 		} catch (Exception e) {
 			logger.error(e, e);
 			AssertJUnit.fail(e.getMessage());
@@ -489,6 +489,11 @@
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
+			recyle.recyle_return();
+			Utils.waitUntilUrlChange(
+					SERVER_URL
+							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
+					8);
 			Utils.retryingFindAndClick(By.id("return"));
 			Utils.waitUntilUrlChange(SERVER_URL + "/homepage/portalPage.jsp", 8);
 			Utils.tryToCloseWarningWindow();