Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r21140 -r21187
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21140)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 21187)
@@ -118,12 +118,22 @@
 			dialogWindowClose();
 			List<WebElement> Buttons = tousseItemTable.findElements(By
 					.xpath("//tbody/tr/td/a[contains(text(), '-')]"));
-			for (WebElement Button : Buttons) {
-				Button.click();
-				WebElement element = Utils.retryingFind(By.id("idBoxClose"));
-				if (Utils.isFind(element)) {
-					Utils.retryingFindAndClick(By.id("idBoxClose"));
+			List<WebElement> Amounts = tousseItemTable.findElements(By
+					.cssSelector("input[name^='recycleAmount']"));
+			for (WebElement Amount : Amounts) {
+				int i = Integer.valueOf(Amount.getText()).intValue();
+				if (i > 1) {
+					for (WebElement Button : Buttons) {
+						Button.click();
+						WebElement element = Utils.retryingFind(By
+								.id("idBoxClose"));
+						if (Utils.isFind(element)) {
+							Utils.retryingFindAndClick(By.id("idBoxClose"));
+						}
+						continue;
+					}
 				}
+				continue;
 			}
 
 			tousseItemTable = Utils.retryingFind(By.id("tousseItemTable"));
@@ -249,7 +259,7 @@
 
 			// 获取器械包的器械（材料）清单表格
 			WebElement tousseItemTable = this.scanRecycleUserBarcode();
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐4")
+			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐2")
 					.getString("条码") + "\n");
 
 			dialogWindowClose();
@@ -278,7 +288,7 @@
 				// click之前等待页面加载完毕
 				JSWaiter.waitUntilJQueryReady();
 				addButton.click();
-
+				dialogWindowClose();
 			}
 			Utils.retryingFindAndSendKeys(By.id("tousseItemTable"),
 					Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString("条码")
@@ -308,13 +318,19 @@
 				} else {
 					addButtons = tousseItemTable.findElements(By
 							.cssSelector(".btn-a"));
-					Utils.retryingFindAndClick(By
-							.xpath("//tbody/tr/td/a[contains(text(), '+')]"));
-					for (WebElement addButton : addButtons) {
-						// click之前等待页面加载完毕
-						JSWaiter.waitUntilJQueryReady();
-						addButton.click();
-						dialogClose();
+					List<WebElement> loadedAmounts = tousseItemTable
+							.findElements(By
+									.cssSelector("input[name^='loadedAmount']"));
+					for (WebElement loadedAmount : loadedAmounts) {
+						if (loadedAmount.getText()!=null&&loadedAmount.getText().equals("0")) {
+							for (WebElement addButton : addButtons) {
+								// click之前等待页面加载完毕
+								JSWaiter.waitUntilJQueryReady();
+								addButton.click();
+								dialogClose();
+								continue;
+							}
+						}
 					}
 				}
 				Utils.retryingFindAndClick(By.id("saveBtn"));
@@ -390,53 +406,55 @@
 									+ "\n").perform();
 			WebElement element = Utils.tryFind(By.id("tousseItemTable"));
 			if (element == null) {
-				Utils.retryingFindClickFirstCellOfTable(By
-						.id("awaitForRecycleTable"));
-				waitUrlChange();
-			}
-			this.scanRecycleUserBarcode();
-			// 获取器械包的器械（材料）清单表格
-			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
-			WebElement tousseItemTable = wait
-					.until(new Function<WebDriver, WebElement>() {
-						public WebElement apply(WebDriver driver) {
-							return Utils.retryingFind(By.id("tousseItemTable"));
-						}
-					});
-			if (Utils.isFind(Utils.retryingFind(By.id("tousseDetailTable0")))) {
-				tousseItemTable.sendKeys(Utils.settings.getJSONObject(
-						"一级供应室清洗篮筐4").getString("条码")
-						+ "\n");
-				dialogWindowClose();
-				// 根据cssClass获取入筐按钮集合
-				List<WebElement> addButtons = tousseItemTable.findElements(By
-						.cssSelector(".btn-a"));
-				for (WebElement addButton : addButtons) {
-					addButton.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"));
+				this.scanRecycleUserBarcode();
+				// 获取器械包的器械（材料）清单表格
+				Wait<WebDriver> wait = WaitFactory.createDefaultWait();
+				WebElement tousseItemTable = wait
+						.until(new Function<WebDriver, WebElement>() {
+							public WebElement apply(WebDriver driver) {
+								return Utils.retryingFind(By
+										.id("tousseItemTable"));
+							}
+						});
+				if (Utils
+						.isFind(Utils.retryingFind(By.id("tousseDetailTable0")))) {
+					tousseItemTable.sendKeys(Utils.settings.getJSONObject(
+							"一级供应室清洗篮筐4").getString("条码")
+							+ "\n");
+					dialogWindowClose();
+					// 根据cssClass获取入筐按钮集合
+					List<WebElement> addButtons = tousseItemTable
+							.findElements(By.cssSelector(".btn-a"));
+					for (WebElement addButton : addButtons) {
+						addButton.click();
+					}
+					Utils.retryingFindAndClick(By.id("saveBtn"));
+					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();
+					}
+				} else {
+					Utils.driver.navigate().back();
 				}
-			});
-			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();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();