Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r19800 -r19882
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19800)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19882)
@@ -35,15 +35,15 @@
 			Utils.init();
 			Login login = new Login();
 			login.login_oneSupplyRoom();
-			// login.login_secondSupplyRoom();
+//			 login.login_secondSupplyRoom();
 
 			Utils.retryingFindAndHover(By.id("packing"));
 
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("一级供应室装配组").getString("名称2")));
 			// Utils.retryingFindAndClick(By.linkText(Utils.settings
 			// .getJSONObject("一级供应室装配组").getString("名称3")));
-			// Utils.retryingFindAndClick(By.linkText(Utils.settings.getJSONObject("二级供应室装配组").getString("名称1")));
+//			 Utils.retryingFindAndClick(By.linkText(Utils.settings.getJSONObject("二级供应室装配组").getString("名称1")));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
 
 		} catch (Exception e) {
@@ -869,6 +869,10 @@
 					Utils.settings.getJSONObject("二级供应室审核人").getString("条码")
 							+ "\n");
 			Utils.retryingFindAndSendKeys(
+					By.cssSelector("input[name='reviewerBarcode']"),
+					Utils.settings.getJSONObject("二级供应室审核人").getString("条码")
+							+ "\n");
+			Utils.retryingFindAndSendKeys(
 					By.cssSelector("input[name='basketBarcodeInput']"),
 					Utils.settings.getJSONObject("二级供应室清洗篮筐1").getString("条码")
 							+ "\n");
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19827 -r19882
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19827)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19882)
@@ -34,7 +34,8 @@
  *
  */
 
-public class ALL extends AbstractCSSDTest {
+public class ALL extends AbstractCSSDTest
+{
 
 	protected Logger logger = Logger.getLogger(this.getClass());
 
@@ -158,7 +159,15 @@
 			/** 二级供应室清洗成功 */
 			wash.wash_secondSupplyRoom();
 			logger.info("二级供应室清洗成功");
-			wash.after();
+			Utils.driver.switchTo().defaultContent();
+			Utils.retryingFindAndClick(By
+					.xpath("//span[contains(text(), '个人桌面')]"));
+			Utils.retryingFindAndHover(By.id("packing"));
+			Utils.retryingFindAndClick(By.linkText(Utils.settings
+					.getJSONObject("二级供应室装配组").getString("名称1")));
+			/** 二级供应室装配 */
+			assemble.assemble_secondSupplyRoomSet();
+			assemble.after();
 			recyle.init();
 			/** 一级供应室回收带标识牌的回收单 */
 			recyle.recyle_recyleSignboardAndDropAndScrap();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
===================================================================
diff -u -r19800 -r19882
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 19800)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 19882)
@@ -74,6 +74,7 @@
 			
 			for (int i = 6; i < 9; i++) {
 				String x = (int) (Math.random() * 8 + 1) + "";
+				Utils.retryingFindAndClick(By.id("name1"));
 				Utils.retryingFindAndSendKeys(By.id("name1"),Keys.DOWN);
 				Utils.retryingFindAndClick(
 						By.xpath("//div/div/div[contains(text(), '" + name