Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r26427 -r26493
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 26427)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 26493)
@@ -172,12 +172,14 @@
 				if (Utils.isFind(element)) {
 					waitUrlChange();
 				} else {
-					logger.debug("点击 awaitForRecycleTable表格的 第一个单元格");
-					boolean result = Utils.retryingFindClickFirstCellOfTable(By
-							.id("awaitForRecycleTable"));
-
-					logger.debug("点击结果 = " + result);
-
+//					logger.debug("点击 awaitForRecycleTable表格的 第一个单元格");
+//					boolean result = Utils.retryingFindClickFirstCellOfTable(By
+//							.id("awaitForRecycleTable"));
+//
+//					logger.debug("点击结果 = " + result);
+					//点击待回收表格第一行第一列
+					Utils.retryingFindAndClick(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]"));
+					
 					waitUrlChange();
 				}
 				WebElement recycleForm = this.scanRecycleUserBarcode();
@@ -368,8 +370,10 @@
 			// .id("awaitForRecycleTable"));
 			WebElement element = Utils.retryingFind(By.id("tousseItemTable"));
 			if (element == null) {
-				Utils.retryingFindClickFirstCellOfTable(By
-						.id("awaitForRecycleTable"));
+//				Utils.retryingFindClickFirstCellOfTable(By
+//						.id("awaitForRecycleTable"));
+				//点击待回收表格第一行第一列
+				Utils.retryingFindAndClick(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]"));
 				waitUrlChange();
 			} else {
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
===================================================================
diff -u -r26467 -r26493
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 26467)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java	(.../SterilizationTest.java)	(revision 26493)
@@ -164,6 +164,7 @@
 					}
 					//质量监测完该包变为“已废弃”状态，因此移除
 					Utils.oneSupplyReBarcodes.remove(tempBarcode1);
+					Utils.getSeleniumRuntimeData().getInsideTousseBarcodes().remove(tempBarcode1);
 					System.out.println("器械包"+tempBarcode1+"已废弃");
 				} else {
 					//若无未入筐的器械包，则通过器械包名字选择器械包进行抽检
@@ -248,6 +249,7 @@
 					}
 					//质量监测完该包变为“已废弃”状态，因此移除
 					Utils.oneSupplyReBarcodes.remove(tempBarcode2);
+					Utils.getSeleniumRuntimeData().getInsideTousseBarcodes().remove(tempBarcode2);
 					System.out.println("器械包"+tempBarcode2+"已废弃");
 
 				} else {
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r26437 -r26493
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 26437)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 26493)
@@ -582,8 +582,11 @@
 					+ "/?logonType=1080p");
 			login.loginAction();
 			Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15);
+			element = Utils.retryingFindForthCellOfTable(By
+					.id("awaitForRecycleTable"));
+			Utils.retryingFindAndClick(By.id("appTypeSelect"));
 			Utils.retryingFindAndClick(By
-					.cssSelector("option[value='类型']"));
+					.xpath("//option[contains(text(),'类型')]"));
 			Utils.retryingFindAndClick(By.linkText("申请时间"));
 			recyle.recyle_Monitor();
 			JSWaiter.waitUntilJQueryReady();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
===================================================================
diff -u -r26436 -r26493
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 26436)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java	(.../Disinfection.java)	(revision 26493)
@@ -16,22 +16,16 @@
 import java.util.Date;
 import java.util.List;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.ui.ExpectedCondition;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.Wait;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 import test.forgon.disinfectsystem.selenium.factory.WaitFactory;
 import test.forgon.disinfectsystem.selenium.sterilization.helper.SterilizationHelper;
@@ -142,16 +136,13 @@
 			
 			//选取篮筐中的前三个条码不为空的器械包移出篮筐
 			int i = 0;
-			List<WebElement> tables = new ArrayList<WebElement>();
 			while(i<6){
-				JSWaiter.waitUntilJSReady();
 				JSWaiter.waitUntilJQueryReady();
 				//器械包明细表
-				tables = Utils.driver.findElements(By.xpath("//*[@id='tousseGrid']/div[2]/div[1]/div[1]/div[1]/div[2]//tbody"));
+				List<WebElement> tables = Utils.driver.findElements(By.xpath("//*[@id='tousseGrid']/div[2]/div[1]/div[1]/div[1]/div[2]//tbody"));
 				logger.debug("rows size = " + tables.size());
 				if(tables.size()>0){
 					//页面发生变化后，需要重新获取该元素
-					JSWaiter.waitUntilJSReady();
 					JSWaiter.waitUntilJQueryReady();
 					tables = Utils.driver.findElements(By.xpath("//*[@id='tousseGrid']/div[2]/div[1]/div[1]/div[1]/div[2]//tbody"));
 					for(WebElement table:tables){
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r26436 -r26493
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 26436)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 26493)
@@ -135,10 +135,13 @@
 			}
 			Utils.retryingFindAndClick(By.id("save_print"));
 			JSWaiter.waitUntilJQueryReady();
-			/** 获取装配成功后的条码 **/
-			Utils.barcodes = Utils.getToussesBarcodes("one");
-			logger.info("本次装配条码：" + Utils.barcodes);
-			logger.info("所有装配条码：" + Utils.oneSupplyReBarcodes);
+			/** 获取装配成功后的条码
+			 *  该包装配完，下一步骤是干预拆包，拆包完成后导致此次装配产生的条码会变为废弃状态，
+			 *  因此不再将此条码放进oneSupplyReBarcodes
+			 */
+//			Utils.barcodes = Utils.getToussesBarcodes("one");
+//			logger.info("本次装配条码：" + Utils.barcodes);
+//			logger.info("所有装配条码：" + Utils.oneSupplyReBarcodes);
 		} catch (Exception e) {
 			e.printStackTrace();
 			fail(e.getMessage());