Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r19050 -r19060
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 19050)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 19060)
@@ -1134,8 +1134,9 @@
 		WebElement table = null;
 		try {
 			// 扫描回收人条码
+			if(Utils.isFind(Utils.findByAwait(By.id("recyclingUser")))){
 			table = this.scanBarcode(By.id("recyclingUser"), "回收人");
-			this.logger.info("扫描回收人条码成功");
+			this.logger.info("扫描回收人条码成功");}
 			// Utils.doWait(500);
 			// 扫描清点人条码
 			table = this.scanBarcode(By.id("operator"), "清点人");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19050 -r19060
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19050)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19060)
@@ -33,7 +33,9 @@
  *
  */
 
-public class ALL extends AbstractCSSDTest {
+public class ALL 
+//extends AbstractCSSDTest
+{
 
 	protected Logger logger = Logger.getLogger(this.getClass());
 
@@ -105,56 +107,57 @@
 	@Test
 	public void all() {
 		try {
-			initCSSDData();
-			// 由于省医增加配置一次性物品没库存无法申请,调整一次性物品入库到申请前
-			oneUse();
-			before();
-			System.out.print("回收开始:");
-			Utils.DateTime();
-			login.init();
-			final String SERVER_URL = Utils.settings.get("服务器地址").toString();
-			Utils.driver.get(SERVER_URL + "/?logonType=1080p");
-			login.login_secondSupplyRoom(false);
-			/** 二级供应室回收 */
-			/** 二级供应室自定义入筐回收 */
-			recyle.recyle_custom(Utils.settings.getJSONObject("二级供应室清洗篮筐1")
-					.getString("条码"));
-			Utils.waitUntilUrlChange(
-					SERVER_URL
-							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
-					8);
-			/** 二级供应室判断消毒物品申请单是否存在 */
-			Utils.retryingFind(By.tagName("body"));
-
-			WebElement element = Utils.retryingFindForthCellOfTable(By
-					.id("awaitForRecycleTable"));
-			if (Utils.isFind(element)) {
-				recyle.recyle_SecondSupplyRoom();
-				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();
-			} else {
-				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();
-			}
-			/** 二级供应室清洗成功 */
-			wash.wash_secondSupplyRoom();
-			logger.info("二级供应室清洗成功");
-			wash.after();
+//			initCSSDData();
+//			// 由于省医增加配置一次性物品没库存无法申请,调整一次性物品入库到申请前
+//			oneUse();
+//			before();
+//			System.out.print("回收开始:");
+//			Utils.DateTime();
+//			login.init();
+//			final String SERVER_URL = Utils.settings.get("服务器地址").toString();
+//			Utils.driver.get(SERVER_URL + "/?logonType=1080p");
+//			login.login_secondSupplyRoom(false);
+//			/** 二级供应室回收 */
+//			/** 二级供应室自定义入筐回收 */
+//			recyle.recyle_custom(Utils.settings.getJSONObject("二级供应室清洗篮筐1")
+//					.getString("条码"));
+//			Utils.waitUntilUrlChange(
+//					SERVER_URL
+//							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
+//					8);
+//			/** 二级供应室判断消毒物品申请单是否存在 */
+//			Utils.retryingFind(By.tagName("body"));
+//
+//			WebElement element = Utils.retryingFindForthCellOfTable(By
+//					.id("awaitForRecycleTable"));
+//			if (Utils.isFind(element)) {
+//				recyle.recyle_SecondSupplyRoom();
+//				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();
+//			} else {
+//				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();
+//			}
+//			/** 二级供应室清洗成功 */
+//			wash.wash_secondSupplyRoom();
+//			logger.info("二级供应室清洗成功");
+//			wash.after();
 			recyle.init();
 			/** 一级供应室回收带标识牌的回收单 */
 			recyle.recyle_recyleSignboardAndDropAndScrap();
+			String SERVER_URL = Utils.settings.get("服务器地址").toString();
 			Utils.waitUntilUrlChange(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
@@ -209,6 +212,7 @@
 			logger.info("一级供应室回收外来器械完成");
 			/** 判断自定义器械包申请单是否存在 */
 			Utils.retryingFind(By.tagName("body"));
+			WebElement
 			element = Utils.retryingFindForthCellOfTable(By
 					.id("awaitForRecycleTable"));
 			if (Utils.isFind(element)) {
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
===================================================================
diff -u -r19050 -r19060
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java	(.../Login.java)	(revision 19050)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java	(.../Login.java)	(revision 19060)
@@ -128,8 +128,6 @@
 	private void isLoginSuccess() {
 		
 		JSWaiter.waitUntilJQueryReady();
-		Utils.waitUntilUrlContains("homepage/portalPage.jsp", 15);
-
 		System.out.println("Page title is: " + Utils.driver.getTitle());
 
 		Utils.tryToCloseWarningWindow();