Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19882 -r19901
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19882)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19901)
@@ -34,8 +34,7 @@
  *
  */
 
-public class ALL extends AbstractCSSDTest
-{
+public class ALL extends AbstractCSSDTest {
 
 	protected Logger logger = Logger.getLogger(this.getClass());
 
@@ -168,6 +167,11 @@
 			/** 二级供应室装配 */
 			assemble.assemble_secondSupplyRoomSet();
 			assemble.after();
+			/** 二级供应室装配后做代理灭菌 */
+			Utils.init();
+			login.login_oneSupplyRoom();
+			disinfection.disinfection_agent();
+			disinfection.after();
 			recyle.init();
 			/** 一级供应室回收带标识牌的回收单 */
 			recyle.recyle_recyleSignboardAndDropAndScrap();
@@ -469,10 +473,20 @@
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		Utils.driver.quit();
-		WindowsUtils.killByName("IEDriverServer.exe");
-		WindowsUtils.killByName("iexplore.exe");
-		// TODO:暂时用下面语句杀掉IE进程，解决IE8，win7运行后装配界面没有关闭的问题
-		WindowsUtils.killByName("iexplore.exe *32");
+		try {
+			Utils.driver.quit();
+			WindowsUtils.killByName("IEDriverServer.exe");
+			WindowsUtils.killByName("iexplore.exe");
+			// TODO:暂时用下面语句杀掉IE进程，解决IE8，win7运行后装配界面没有关闭的问题
+			WindowsUtils.killByName("iexplore.exe *32");
+
+			Runtime.getRuntime()
+					.exec("taskkill /F /im " + "IEDriverServer.exe");
+			Runtime.getRuntime().exec("taskkill /F /im " + "iexplore.exe");
+			Runtime.getRuntime().exec("taskkill /F /im " + "iexplore.exe *32");
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 }
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
===================================================================
diff -u -r19800 -r19901
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 19800)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 19901)
@@ -587,7 +587,7 @@
 					.xpath("//button[contains(text(), '保存')]"));
 			Utils.retryingFindAndSwitchToFrame(By
 					.id("iframe_sterilizationRecord"));
-			
+
 			Utils.retryingFindAndClick(By.xpath("//p[contains(text(), '灭菌中')]"));
 
 			Utils.retryingFindAndClick(By
@@ -1099,22 +1099,20 @@
 			Utils.retryingFindAndClick(By
 					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
 			Date now = new Date();
-			name = Utils.settings.getJSONObject("灭菌程序")
-					.getString("名称1");
+			name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
 			Utils.retryingFindAndSendKeys(By.id("sterilingType1"), Keys.DOWN);
 			SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 			Utils.retryingFindAndSendKeys(By.id("sterileStartDate1"),
 					dateFormater.format(now));
 			Utils.retryingFindAndClick(By
-					.xpath("//div/div/div[contains(text(), '" + name + "')]"));		
+					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
 			Utils.retryingFindAndSendKeys(By.id("count1"), "2" + "\n");
 			Utils.retryingFindAndSendKeys(By.id("package1"), Keys.DOWN);
 			name = Utils.settings.getJSONObject("一级供应室外部代理灭菌包2")
 					.getString("名称");
 			Utils.retryingFindAndClick(By
 					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			name = Utils.settings.getJSONObject("灭菌程序")
-					.getString("名称2");
+			name = Utils.settings.getJSONObject("灭菌程序").getString("名称2");
 			Utils.retryingFindAndSendKeys(By.id("sterilingType1"), Keys.DOWN);
 			Utils.retryingFindAndClick(By
 					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
@@ -1140,6 +1138,11 @@
 	@Test
 	public void disinfection_agent() {
 		try {
+			/**
+			 * 调试用 Utils.driver.switchTo().defaultContent();
+			 * Utils.retryingFindAndClick(By
+			 * .xpath("//span[contains(text(), '个人桌面')]"));
+			 */
 			Utils.retryingFindAndClick(By.id("enterpriseView"));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
 			Utils.retryingFindAndClick(By
@@ -1153,29 +1156,33 @@
 					.xpath("//button[contains(text(), '添加')]"));
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-
 			Utils.retryingFindAndSendKeys(By.id("package1"), Utils.settings
-					.getJSONObject("一级供应室灭菌篮筐3").getString("条码") + "\n");
-			for (int i = 0; i < Utils.barcodes.size(); i++) {
-				Utils.retryingFindAndSendKeys(By.id("package1"),
-						Utils.barcodes.get(i) + "\n");
-			}
+					.getJSONObject("灭菌篮筐01").getString("条码") + "\n");
+			if (Utils.reBarcodes.isEmpty()) {
+			} else {
+				for (int i = 0; i < Utils.reBarcodes.size(); i++) {
+					Utils.retryingFindAndSendKeys(By.id("package1"),
+							Utils.reBarcodes.get(i) + "\n");
+				}
 
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '放入容器')]"));
-			Utils.retryingFindAndSendKeys(By.id("canResendout"), Keys.DOWN);
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '放入容器')]"));
+				Utils.retryingFindAndSendKeys(By.id("canResendout"), Keys.DOWN);
 
-			Utils.retryingFindAndClick(By
-					.xpath("//div/div/div[contains(text(), '是')]"));
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//div/div/div[contains(text(), '是')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
 
-			currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '是')]"));
-
+				currentwindowhandle = Utils.driver.getWindowHandle();
+				Utils.driver.switchTo().window(currentwindowhandle);
+				JSWaiter.waitUntilJQueryReady();
+				Utils.retryingFindAndHover(By
+						.xpath("//button[contains(text(), '是')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '是')]"));
+				JSWaiter.waitUntilJQueryReady();
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -1221,7 +1228,7 @@
 	}
 
 	@AfterMethod
-	public void after() {
+	public void after(){
 		Utils.driver.quit();
 		WindowsUtils.killByName("IEDriverServer.exe");
 		WindowsUtils.killByName("iexplore.exe");