Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r20979 -r20982
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20979)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20982)
@@ -195,9 +195,6 @@
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndClick(By
 					.xpath("//span[contains(text(), '个人桌面')]"));
-			Actions moveover = new Actions(Utils.driver);
-			moveover.moveToElement(Utils.retryingFind(By.id("reviewPacking")))
-					.perform();
 			Utils.retryingFindAndHover(By.id("reviewPacking"));
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("二级供应室装配组").getString("名称1")));
@@ -225,6 +222,13 @@
 			userrecord.UserRecord_success();
 			recyle.after();
 			recyle.init();
+			/** 一级供应室回收二级供应室使用记录转换的申请单*/
+			recyle.recyle_userRecordApplyUpdate();
+			Utils.waitUntilUrlChange(
+					SERVER_URL
+							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
+					8);
+			logger.info("一级供应室回收二级供应室使用记录转换的申请单");
 			/** 一级供应室回收带标识牌的回收单 */
 			recyle.recyle_recyleSignboardAndDropAndScrap();
 			Utils.waitUntilUrlChange(
@@ -262,7 +266,6 @@
 			logger.info("一级供应室回收单确认完成");
 			/** 一级供应室回收申请单 */
 			recyle.recyle_oneSupplyRoomSignboard();
-
 			Utils.waitUntilUrlChange(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
===================================================================
diff -u -r20961 -r20982
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20961)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java	(.../Recyle.java)	(revision 20982)
@@ -346,12 +346,29 @@
 	}
 
 	/**
-	 * 一级供应室使用记录转申请单回收,修改回收数量
+	 * 一级供应室回收二级供应室使用记录转换的申请单
 	 * */
 	@Test
 	public void recyle_userRecordApplyUpdate() {
 		try {
-
+			Utils.waitUntilUrlChange(
+					Utils.settings.get("服务器地址").toString()
+							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
+					8);
+			Actions actions = new Actions(Utils.driver);
+			actions.moveToElement(
+					Utils.retryingFindAssure(By.id("awaitForRecycleTable")))
+					.sendKeys(
+							Utils.settings.getJSONObject("二级供应室").getString(
+									"条码")
+									+ "\n").perform();
+			WebElement element = Utils.tryFind(By.id("tousseItemTable"));
+			if (element == null) {
+				Utils.retryingFindClickFirstCellOfTable(By
+						.id("awaitForRecycleTable"));
+				waitUrlChange();
+			}
+			this.scanRecycleUserBarcode();
 			// 获取器械包的器械（材料）清单表格
 			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
 			WebElement tousseItemTable = wait
@@ -360,32 +377,25 @@
 							return Utils.retryingFind(By.id("tousseItemTable"));
 						}
 					});
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1")
-					.getString("条码") + "\n");
-			// 增加休眠，避免扫描后提示条码不符合规范的问题
-
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐3")
-					.getString("条码") + "\n");
-			// 根据cssClass获取入筐按钮集合
-			List<WebElement> addButtons = tousseItemTable.findElements(By
-					.cssSelector(".btn-a"));
-			// 序号，回收数量输入框的名称后缀
-			int index = addButtons.size();
-			for (WebElement addButton : addButtons) {
-				index--;
-				// 点击回收数量输入框
-				Utils.retryingFindAndClick(By.id("recycleAmount" + index));
-				// 弹出了数量输入的对话框
-
-				Utils.retryingFindAndSwitchToFrame(By.tagName("iframe"));
-
-				Utils.retryingFindAndClick(By.linkText("1"));
-				Utils.retryingFindAndClick(By.cssSelector(".btn-a"));
-				Utils.driver.switchTo().defaultContent();
-				addButton.click();
+			if (Utils.isFind(Utils.retryingFind(By.id("tousseDetailTable0")))) {
+				tousseItemTable.sendKeys(Utils.settings.getJSONObject(
+						"一级供应室清洗篮筐4").getString("条码")
+						+ "\n");
+				dialogWindowClose();
+				// 根据cssClass获取入筐按钮集合
+				List<WebElement> addButtons = tousseItemTable.findElements(By
+						.cssSelector(".btn-a"));
+				for (WebElement addButton : addButtons) {
+					if (addButtons.size() > 1) {
+						Utils.retryingFindAndClick(By.cssSelector(".btn-d"));
+						dialogWindowClose();
+					}
+					addButton.click();
+				}
+				Utils.retryingFindAndClick(By.id("saveBtn"));
+			} else {
+				Utils.driver.navigate().back();
 			}
-			Utils.retryingFindAndClick(By.id("saveBtn"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
===================================================================
diff -u -r20580 -r20982
--- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json	(.../settings.json)	(revision 20580)
+++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json	(.../settings.json)	(revision 20982)
@@ -35,6 +35,11 @@
         "科室编码": "testNeike",
         "名称": "测试内科"
     },
+    "二级供应室": {
+        "条码": "310000119",
+        "科室编码": "testOR",
+        "名称": "测试手术室"
+    },
     "一级供应室器械包": {
         "固定条码": "",
         "名称": "Test穿刺包"