Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19931 -r20036
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19931)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20036)
@@ -296,7 +296,6 @@
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("一级供应室装配组").getString("名称3")));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking"));
-			// WebElement
 			element = Utils.retryingFind(By
 					.xpath("//button[contains(text(), '进入审核列表')]"));
 			handleReview(element, review);
@@ -326,17 +325,6 @@
 			assemble.assemble_Scrap();
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
-			/***
-			 * 屏蔽暂时不需要的代码
-			 * **/
-			/***
-			 * assemble.assemble_success1();
-			 * Utils.driver.switchTo().defaultContent(); displayed = false;
-			 * WebElement element = Utils.retryingFind(By
-			 * .xpath("//button[contains(text(), '确定')]")); if (element != null)
-			 * { displayed = element.isDisplayed(); if (displayed) {
-			 * element.click(); } }
-			 **/
 			assemble.assemble_SignboardAndDrop();
 			assemble.assemble_dressing();
 			assemble.assemble_CustomSet();
@@ -421,9 +409,13 @@
 					.xpath("//div/a/span[contains(text(), '退货记录信息')]"));
 			reject.Reject_set_success_ou();
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
-			JSWaiter.waitUntilJQueryReady();
 			reject.Reject_one_use_success();
-			reject.after();
+			/*** 供应室退货 后发货 ***/
+			Utils.driver.switchTo().defaultContent();
+			Utils.retryingFindAndClick(By
+					.xpath("//span[contains(text(), '个人桌面')]"));
+			delivery.Delivery_rejectsendout();
+			delivery.after();
 		} catch (Exception e) {
 			logger.error(e, e);
 			e.printStackTrace();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
===================================================================
diff -u -r19931 -r20036
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java	(.../Login.java)	(revision 19931)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java	(.../Login.java)	(revision 20036)
@@ -123,12 +123,13 @@
 	@Test
 	public void login_Out() {
 		try {
+			JSWaiter.waitUntilJQueryReady();
 			Utils.driver.switchTo().defaultContent();
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
 			Utils.retryingFindAndClick(By.cssSelector("a[title='退出系统']"));
 			Utils.waitUntilUrlChange(Utils.settings.get("服务器地址").toString()
-					+ "/logon.jsp", 8);
+					+ "/logon.jsp", 10);
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -137,13 +138,16 @@
 
 	public void loginAction() {
 		JSWaiter.waitUntilJQueryReady();
-		Utils.retryingFind(By.id("j_username_display")).clear();
-		Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-				Utils.settings.getJSONObject("一级供应室用户").get("工号").toString());
-		Utils.retryingFind(By.id("j_password")).clear();
-		Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
-				.getJSONObject("一级供应室用户").get("密码").toString());
-		Utils.retryingFindAndClick(By.id("btn1"));
+		if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) {
+			Utils.retryingFind(By.id("j_username_display")).clear();
+			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+					Utils.settings.getJSONObject("一级供应室用户").get("工号")
+							.toString());
+			Utils.retryingFind(By.id("j_password")).clear();
+			Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
+					.getJSONObject("一级供应室用户").get("密码").toString());
+			Utils.retryingFindAndClick(By.id("btn1"));
+		}
 	}
 
 	/**
@@ -166,23 +170,26 @@
 	@Test
 	public void login_touch() {
 		try {
-			Utils.retryingFind(By.id("j_username_display")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-					Utils.settings.getJSONObject("一级供应室用户").get("工号")
-							.toString());
-			Utils.retryingFind(By.id("j_password")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
-					.getJSONObject("一级供应室用户").get("密码").toString());
-			Utils.retryingFindAndClick(By.id("btn1"));
-			System.out.println("Page title is: " + Utils.driver.getTitle());
-			Utils.waitUntilUrlChange(
-					Utils.settings.get("服务器地址")
-							+ "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980",
-					10);
-			assertEquals(
-					Utils.settings.get("服务器地址")
-							+ "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980",
-					Utils.driver.getCurrentUrl());
+			if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) {
+				Utils.retryingFind(By.id("j_username_display")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+						Utils.settings.getJSONObject("一级供应室用户").get("工号")
+								.toString());
+				Utils.retryingFind(By.id("j_password")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_password"),
+						Utils.settings.getJSONObject("一级供应室用户").get("密码")
+								.toString());
+				Utils.retryingFindAndClick(By.id("btn1"));
+				System.out.println("Page title is: " + Utils.driver.getTitle());
+				Utils.waitUntilUrlChange(
+						Utils.settings.get("服务器地址")
+								+ "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980",
+						10);
+				assertEquals(
+						Utils.settings.get("服务器地址")
+								+ "/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp?resolution=1980",
+						Utils.driver.getCurrentUrl());
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -207,23 +214,25 @@
 	 */
 	public void login_secondSupplyRoom(boolean isLoginToHomepage) {
 		try {
-			Utils.retryingFind(By.id("j_username_display")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-					Utils.settings.getJSONObject("二级供应室用户").getString("工号"));
-			Utils.retryingFind(By.id("j_password")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
-					.getJSONObject("二级供应室用户").getString("密码"));
-			Utils.retryingFindAndClick(By.id("btn1"));
+			if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) {
+				Utils.retryingFind(By.id("j_username_display")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+						Utils.settings.getJSONObject("二级供应室用户").getString("工号"));
+				Utils.retryingFind(By.id("j_password")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_password"),
+						Utils.settings.getJSONObject("二级供应室用户").getString("密码"));
+				Utils.retryingFindAndClick(By.id("btn1"));
 
-			if (isLoginToHomepage) {
-				isLoginSuccess();
-				Utils.tryToCloseWarningWindow();
-			} else {
-				Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
+				if (isLoginToHomepage) {
+					isLoginSuccess();
+					Utils.tryToCloseWarningWindow();
+				} else {
+					Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
+				}
+				JSWaiter.waitUntilJQueryReady();
+				// Utils.waitUntilUrlChange(Utils.settings.get("服务器地址")
+				// + "/homepage/portalPage.jsp", 8);
 			}
-			JSWaiter.waitUntilJQueryReady();
-			// Utils.waitUntilUrlChange(Utils.settings.get("服务器地址")
-			// + "/homepage/portalPage.jsp", 8);
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -235,15 +244,17 @@
 	 * */
 	@Test
 	public void login_clinic() {
-		Utils.retryingFind(By.id("j_username_display")).clear();
-		Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-				Utils.settings.getJSONObject("临床科室用户").get("工号").toString());
-		Utils.retryingFind(By.id("j_password")).clear();
-		Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
-				.getJSONObject("临床科室用户").get("密码").toString());
-		Utils.retryingFindAndClick(By.id("btn1"));
+		if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) {
+			Utils.retryingFind(By.id("j_username_display")).clear();
+			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+					Utils.settings.getJSONObject("临床科室用户").get("工号").toString());
+			Utils.retryingFind(By.id("j_password")).clear();
+			Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
+					.getJSONObject("临床科室用户").get("密码").toString());
+			Utils.retryingFindAndClick(By.id("btn1"));
 
-		isLoginSuccess();
+			isLoginSuccess();
+		}
 	}
 
 	/**
@@ -252,25 +263,30 @@
 	@Test
 	public void login_clinicNoWarnig() {
 		try {
-			Utils.retryingFind(By.id("j_username_display")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-					Utils.settings.getJSONObject("临床科室用户").get("工号").toString());
-			Utils.retryingFind(By.id("j_password")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_password"), Utils.settings
-					.getJSONObject("临床科室用户").get("密码").toString());
-			Utils.retryingFindAndClick(By.id("btn1"));
-			// Utils.driver.manage().timeouts().implicitlyWait(15,
-			// TimeUnit.SECONDS);
-			// Utils.retryingFindAndClick(By.cssSelector("div#ext-gen132"));
-			// Utils.retryingFindAndClick(By.cssSelector("div#ext-gen44"));
-			isLoginSuccess();
+			if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) {
+				Utils.retryingFind(By.id("j_username_display")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+						Utils.settings.getJSONObject("临床科室用户").get("工号")
+								.toString());
+				Utils.retryingFind(By.id("j_password")).clear();
+				Utils.retryingFindAndSendKeys(By.id("j_password"),
+						Utils.settings.getJSONObject("临床科室用户").get("密码")
+								.toString());
+				Utils.retryingFindAndClick(By.id("btn1"));
+				// Utils.driver.manage().timeouts().implicitlyWait(15,
+				// TimeUnit.SECONDS);
+				// Utils.retryingFindAndClick(By.cssSelector("div#ext-gen132"));
+				// Utils.retryingFindAndClick(By.cssSelector("div#ext-gen44"));
+				isLoginSuccess();
 
-			System.out.println("Page title is: " + Utils.driver.getTitle());
+				System.out.println("Page title is: " + Utils.driver.getTitle());
 
-			JSWaiter.waitUntilJQueryReady();
+				JSWaiter.waitUntilJQueryReady();
 
-			assertEquals(Utils.settings.get("服务器地址")
-					+ "/homepage/portalPage.jsp", Utils.driver.getCurrentUrl());
+				assertEquals(Utils.settings.get("服务器地址")
+						+ "/homepage/portalPage.jsp",
+						Utils.driver.getCurrentUrl());
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());