Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials.java
===================================================================
diff -u -r20609 -r21140
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials.java	(.../Materials.java)	(revision 20609)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials.java	(.../Materials.java)	(revision 21140)
@@ -152,30 +152,51 @@
 					.xpath("//button[contains(text(), '添加')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndSendKeys(By.id("name1"), Utils.settings
-					.getJSONObject("一级供应室材料").getString("拼音码"));
-
-			String a = (int) (Math.random() * 8 + 1) + "";
-			Utils.retryingFindAndSendKeys(By.id("supplier1"), Keys.DOWN);
-
-			Utils.retryingFindAndSendKeys(By.id("supplier1"), "\n");
-			Utils.retryingFindAndSendKeys(By.id("amount1"), "10" + "\n");
-			Utils.retryingFindAndSendKeys(By.id("name1"), "\n");
-			Utils.retryingFindAndClear(By.id("cost1"));
-			Utils.retryingFindAndSendKeys(By.id("cost1"), a + ".234" + "\n");
-			Utils.retryingFindAndSendKeys(By.id("name1"), Utils.settings
-					.getJSONObject("一级供应室材料1").getString("拼音码"));
-
-			a = (int) (Math.random() * 8 + 1) + "";
-			Utils.retryingFindAndSendKeys(By.id("supplier1"), Keys.DOWN);
-
-			Utils.retryingFindAndSendKeys(By.id("supplier1"), "\n");
-			Utils.retryingFindAndSendKeys(By.id("amount1"), "10" + "\n");
-			Utils.retryingFindAndSendKeys(By.id("name1"), "\n");
-			Utils.retryingFindAndClear(By.id("cost1"));
-			Utils.retryingFindAndSendKeys(By.id("cost1"), a + ".456" + "\n");
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("recyclingApplicationWin")))) {
+				Utils.retryingFindAndClick(By.id("recyclingApplicationWin"));
+				if (Utils.isFind(Utils.retryingFind(By
+						.cssSelector("input[id='hasInvoice']")))) {
+					Utils.retryingFindAndClick(By
+							.cssSelector("input[id='hasInvoice']"));
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"), Keys.DOWN);
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"), "\n");
+				}
+				Utils.retryingFindAndClick(By.id("name1"));
+				Utils.retryingFindAndSendKeys(By.id("name1"), Utils.settings
+						.getJSONObject("一级供应室材料").getString("拼音码"));
+				String a = (int) (Math.random() * 8 + 1) + "";
+				Utils.retryingFindAndSendKeys(By.id("supplier1"), Keys.DOWN);
+				Utils.retryingFindAndSendKeys(By.id("supplier1"), "\n");
+				Utils.retryingFindAndSendKeys(By.id("amount1"), "10" + "\n");
+				Utils.retryingFindAndSendKeys(By.id("name1"), "\n");
+				Utils.retryingFindAndClear(By.id("cost1"));
+				Utils.retryingFindAndSendKeys(By.id("cost1"), a + ".234" + "\n");
+				if (Utils.isFind(Utils.retryingFind(By
+						.cssSelector("input[id='hasInvoice']")))) {
+					Utils.retryingFindAndClick(By
+							.cssSelector("input[id='hasInvoice']"));
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"), Keys.DOWN);
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"), "\n");
+				}
+				Utils.retryingFindAndClear(By.id("name1"));
+				Utils.retryingFindAndSendKeys(By.id("name1"), Utils.settings
+						.getJSONObject("一级供应室材料1").getString("拼音码"));
+				a = (int) (Math.random() * 8 + 1) + "";
+				Utils.retryingFindAndSendKeys(By.id("supplier1"), Keys.DOWN);
+				Utils.retryingFindAndSendKeys(By.id("supplier1"), "\n");
+				Utils.retryingFindAndClear(By.id("amount1"));
+				Utils.retryingFindAndSendKeys(By.id("amount1"), "10" + "\n");
+				Utils.retryingFindAndSendKeys(By.id("name1"), "\n");
+				Utils.retryingFindAndClear(By.id("cost1"));
+				Utils.retryingFindAndSendKeys(By.id("cost1"), a + ".456" + "\n");
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
+			}
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r20979 -r21140
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20979)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21140)
@@ -1308,7 +1308,8 @@
 	public void isAlertPresent() {
 		try {
 			Alert alertBox = null;
-			if (ExpectedConditions.alertIsPresent() != null) {
+			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
+			if (wait.until(ExpectedConditions.alertIsPresent()) != null) {
 				alertBox = Utils.driver.switchTo().alert();
 				System.out.print(alertBox.getText());
 				alertBox.accept();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r21032 -r21140
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21032)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21140)
@@ -412,23 +412,28 @@
 				List<WebElement> addButtons = tousseItemTable.findElements(By
 						.cssSelector(".btn-a"));
 				for (WebElement addButton : addButtons) {
-					if (addButtons.size() > 1) {
-						Utils.retryingFindAndClick(By.cssSelector(".btn-d"));
-						dialogWindowClose();
-						break;
-					} else {
-						addButton.click();
-					}
+					addButton.click();
 				}
-				if (Utils.isFind(Utils.retryingFind(By.cssSelector(".btn-h")))) {
-					Utils.retryingFindAndClick(By.cssSelector(".btn-h"));
-				} else {
-					List<WebElement> Buttons = tousseItemTable.findElements(By
-							.cssSelector(".btn-a"));
-					for (WebElement Button : Buttons) {
-						Button.click();
-					}
+				Utils.retryingFindAndClick(By.id("saveBtn"));
+			} else {
+				Utils.driver.navigate().back();
+			}
+			waitUrlChange();
+			Utils.retryingFind(By.id("recyclingRecordTable"));
+			Utils.retryingFindAndClick(By.id("tr0"));
+			Utils.retryingFindClickFirstCellOfTable(By
+					.id("recyclingRecordTable"));
+			waitUrlChange();
+			tousseItemTable = wait.until(new Function<WebDriver, WebElement>() {
+				public WebElement apply(WebDriver driver) {
+					return Utils.retryingFind(By.id("tousseItemTable"));
 				}
+			});
+			List<WebElement> Buttons = tousseItemTable.findElements(By
+					.cssSelector(".btn-a"));
+			if (Buttons.size() > 1) {
+				Utils.retryingFindAndClick(By.cssSelector(".btn-d"));
+				dialogWindowClose();
 				Utils.retryingFindAndClick(By.id("saveBtn"));
 			} else {
 				Utils.driver.navigate().back();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
===================================================================
diff -u -r20970 -r21140
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 20970)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 21140)
@@ -67,6 +67,17 @@
 			Utils.driver.switchTo().window(currentwindowhandle);
 			if (Utils.isFind(Utils.retryingFind(By.id("godownEntryForm")))) {
 				Utils.retryingFindAndClick(By.id("godownEntryForm"));
+				if (Utils.isFind(Utils.retryingFind(By
+						.cssSelector("input[id='hasInvoice']")))) {
+					Utils.retryingFindAndClick(By
+							.cssSelector("input[id='hasInvoice']"));
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"),
+							Keys.DOWN);
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[id='hasInvoice']"),
+							"\n");
+				}
 				String name = Utils.settings.getJSONObject("一级供应室一次性物品")
 						.getString("名称");
 				// 要等待物品名称下拉框由disable变成enable后即可以被点击后再进行以下操作