Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r26526 -r26530 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26526) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26530) @@ -820,7 +820,7 @@ logger.info("回收还物单开始:"); Utils.retryingFindAndClick(By.id("appTypeSelect")); Utils.retryingFindAndClick(By - .xpath("//option[contains(text(),'类型')]")); + .xpath("//option[contains(text(),'申请还物单')]")); recyle.recyle_return(); logger.info("供应室回收还物单和回收终止完成"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r26493 -r26530 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26493) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26530) @@ -516,42 +516,37 @@ @Test public void recyle_return() { try { - if (Utils.isFind(Utils.retryingFind(By - .cssSelector("td[bgcolor='yellow']")))) { - Utils.retryingFindAndHover(By - .cssSelector("td[bgcolor='yellow']")); - Utils.retryingFindAndClick(By - .cssSelector("td[bgcolor='yellow']")); - waitUrlChange(); - String recyclingFormWindowhandle = Utils.driver - .getWindowHandle(); - Utils.driver.switchTo().window(recyclingFormWindowhandle); - WebElement tousseItemTable = this.scanRecycleUserBarcode(); - tousseItemTable.sendKeys(Utils.settings.getJSONObject( - "一级供应室清洗篮筐3").getString("条码") - + "\n"); - dialogWindowClose(); - // 根据cssClass获取入筐按钮集合 - tousseItemTable = Utils.retryingFind(By.id("tousseItemTable")); - List addButtons = tousseItemTable.findElements(By - .cssSelector(".btn-a")); - for (WebElement addButton : addButtons) { - addButton.click(); + //点击待回收表格第一行第一列 + Utils.retryingFindAndClick(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]")); + waitUrlChange(); + String recyclingFormWindowhandle = Utils.driver + .getWindowHandle(); + Utils.driver.switchTo().window(recyclingFormWindowhandle); + WebElement tousseItemTable = this.scanRecycleUserBarcode(); + tousseItemTable.sendKeys(Utils.settings.getJSONObject( + "一级供应室清洗篮筐3").getString("条码") + + "\n"); + dialogWindowClose(); + // 根据cssClass获取入筐按钮集合 + tousseItemTable = Utils.retryingFind(By.id("tousseItemTable")); + List addButtons = tousseItemTable.findElements(By + .cssSelector(".btn-a")); + for (WebElement addButton : addButtons) { + addButton.click(); - } - Utils.retryingFindAndClick(By.id("saveBtn")); - String SERVER_URL = Utils.settings.get("服务器地址").toString(); - Utils.waitUntilUrlChange( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - /*** 供应室回收终止 ***/ - recyle_terminate(); - JSWaiter.waitUntilJQueryReady(); - Utils.driver.get(Utils.settings.get("服务器地址").toString()); - logger.info("供应室回收终止完成"); - after(); } + Utils.retryingFindAndClick(By.id("saveBtn")); + String SERVER_URL = Utils.settings.get("服务器地址").toString(); + Utils.waitUntilUrlChange( + SERVER_URL + + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", + 8); + /*** 供应室回收终止 ***/ + recyle_terminate(); + JSWaiter.waitUntilJQueryReady(); + Utils.driver.get(Utils.settings.get("服务器地址").toString()); + logger.info("供应室回收终止完成"); + after(); } catch (Exception e) { e.printStackTrace(); fail(e.getMessage());