Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r26702 -r26706
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 26702)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 26706)
@@ -432,13 +432,12 @@
 				addBtn.click();
 			}
 			//保存材料数量
-			WebElement savebtn = Utils.retryingFind(By.xpath("//a[contains(text(),'保存')]"));
-			((JavascriptExecutor) Utils.driver).executeScript("arguments[0].click()", savebtn);
+			Utils.retryingFindAndClick(By.xpath("//a[contains(text(),'保存')]"));
 			
 			//点击确认提示框
 			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
 			wait.until(ExpectedConditions.alertIsPresent());
-			Utils.driver.switchTo().alert().dismiss();
+			Utils.driver.switchTo().alert().accept();
 			
 			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
@@ -488,42 +487,45 @@
 			String recyclingFormWindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(recyclingFormWindowhandle);
 
-			
-			
-			//将整包清洗的Test雾化器先入筐，再做清点确认
-//			Utils.retryingFindAndClick(By.id("intoBasketBtn1"));
-			
-			//点击清点确认按钮
-			Utils.retryingFindAndClick(By.id("isCheckIntoTheBox"));
-			//点击保存
-			Utils.retryingFindAndClick(By.xpath("//span[contains(text(),'保存')]"));
-			//等待跳转到待回收页面
-			Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
-			//断言待回收列表第一条申请单颜色为紫色：background-color: rgb(255, 62, 255);
-			WebElement elelment = Utils.retryingFind(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]"));
-			String style = elelment.getAttribute("style");
-			assertTrue("待回收列表第一条申请单未进行清点确认！","background-color: rgb(255, 62, 255);".equals(style));
-			
-			Utils.retryingFindClickFirstCellOfTable(By.id("awaitForRecycleTable"));
-			waitUrlChange();
-			
-			//扫描篮筐
-			WebElement tousseItemTable = this.scanRecycleUserBarcode();
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1")
-					.getString("条码") + "\n");
+			//查找清点确认按钮
+			WebElement webElement = Utils.retryingFind(By.id("isCheckIntoTheBox"));
+			//若清点确认按钮存在则执行清点确认场景，否则点击返回按钮
+			if(Utils.isFind(webElement)){
+				//点击清点确认按钮
+				webElement.click();
+				//点击保存
+				Utils.retryingFindAndClick(By.xpath("//span[contains(text(),'保存')]"));
+				//等待跳转到待回收页面
+				Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
+				//断言待回收列表第一条申请单颜色为紫色：background-color: rgb(255, 62, 255);
+				WebElement elelment = Utils.retryingFind(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]"));
+				String style = elelment.getAttribute("style");
+				assertTrue("待回收列表第一条申请单未进行清点确认！","background-color: rgb(255, 62, 255);".equals(style));
+				
+				Utils.retryingFindClickFirstCellOfTable(By.id("awaitForRecycleTable"));
+				waitUrlChange();
+				
+				//扫描篮筐
+				WebElement tousseItemTable = this.scanRecycleUserBarcode();
+				tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1")
+						.getString("条码") + "\n");
 
-			dialogWindowClose();
-			tousseItemTable = Utils.retryingFind(By.id("tousseItemTable"));
-			List<WebElement> addButtons = tousseItemTable.findElements(By
-					.cssSelector(".btn-a"));
-			for(int i=0;i<addButtons.size();i++){
-				addButtons.get(i).click();
-				dialogClose();
+				dialogWindowClose();
+				tousseItemTable = Utils.retryingFind(By.id("tousseItemTable"));
+				List<WebElement> addButtons = tousseItemTable.findElements(By
+						.cssSelector(".btn-a"));
+				for(int i=0;i<addButtons.size();i++){
+					addButtons.get(i).click();
+					dialogClose();
+				}
+				//入筐保存
+				Utils.retryingFindAndClick(By.id("saveBtn"));
+				dialogWindowClose();
+			}else{
+				Utils.retryingFindAndClick(By.xpath("//*[@value='取消']"));
+				Utils.retryingFindAndClick(By.xpath("//a[contains(text(),'确定')]"));
 			}
 			
-			Utils.retryingFindAndClick(By.id("saveBtn"));
-			dialogWindowClose();
-			
 		} catch (Exception e) {
 			e.printStackTrace();
 			fail(e.getMessage());