Index: ssts-selenium-test/src/test/java/test_4_1/Recyle.java
===================================================================
diff -u -r17983 -r17998
--- ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17983)
+++ ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17998)
@@ -382,6 +382,10 @@
 	@Test
 	public void recyle_userRecordApply() {
 		try {
+			// 输入临床科室条码，只显示临床科室的申请单
+			Utils.retryingFindAndSendKeys(
+					By.tagName("body"), Utils.settings.getJSONObject("临床科室")
+							.getString("条码") + "\n");
 			WebElement tousseItemTable = scanRecycleUserBarcode();
 			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐3")
 					.getString("条码") + "\n");
@@ -1053,23 +1057,24 @@
 					return Utils.retryingFind(By.id("tousseItemTable"));
 				}
 			});
-			tousseItemTable.sendKeys(Utils.settings.getJSONObject("二级供应室清洗篮筐1")
+			tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1")
 					.getString("条码") + "\n");
-
+			//判断自定义入筐扫完篮筐直到回调成功后才执行后面的入筐
+			wait.until(ExpectedConditions.attributeToBe(By.id("seleniumResult"), "value", "1"));
 			List<WebElement> addButtons = tousseItemTable.findElements(By
 					.cssSelector(".btn-a"));
 			for (WebElement addButton : addButtons) {
 				addButton.click();
 
 			}
 			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
-
+			Thread.sleep(500);
 			for (String winHandle : Utils.driver.getWindowHandles()) {
 				Utils.driver.switchTo().window(winHandle);
 			}
 
 			Utils.retryingFindAndClick(By.cssSelector(".btn-e"));
-
+			Thread.sleep(2000);
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -1109,7 +1114,7 @@
 	/**
 	 * 省医回收扫描回收人和清点人
 	 */
-	public WebElement scanRecycleUserBarcode() {
+	private WebElement scanRecycleUserBarcode() {
 
 		WebElement table = null;
 		try {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r17951 -r17998
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 17951)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 17998)
@@ -272,7 +272,7 @@
                                     return false;
                             }
                       });
-                  	
+                   	  $("#seleniumResult").val("1");
                       if(isBasketLoaded){
                            //将篮筐放置在最前面
                            $("#basketsUl").prepend(currentNode);
@@ -632,6 +632,8 @@
             <input type="hidden" id="tousseInstanceIds" name="tousseInstanceIds"/>
             <input type="hidden" id="recyclingErrors" name="recyclingErrors"/>
             <input type="hidden" id="recyclingDamage" name="recyclingDamage"/>
+            <!-- 用于接收处理后的状态 -->
+            <input type="hidden" id="seleniumResult" name="seleniumResult" value="0"/>
             <c:if test="${param.resolution != 1980}">
             <div class=scanDiv><input id="codeScan" name="codeScan" type="text" class="inputScan" /></div>
             </c:if>