Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20720 -r20769 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20720) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20769) @@ -150,6 +150,15 @@ WebElement element = Utils.retryingFindForthCellOfTable(By .id("awaitForRecycleTable")); if (Utils.isFind(element)) { + String barcode = Utils.settings.getJSONObject("临床科室").getString( + "条码"); + Utils.retryingFindAndSendKeys(By.tagName("body"), barcode + "\n"); + element = Utils.retryingFind(By.id("tousseItemTable")); + if (Utils.isFind(element)) { + Utils.retryingFindClickFirstCellOfTable(By + .id("awaitForRecycleTable")); + waitUrlChange(); + } waitUrlChange(); WebElement recycleForm = this.scanRecycleUserBarcode(); Utils.retryingFindAndSendKeys(By.id("tousseItemTable"), Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20720 -r20769 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20720) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20769) @@ -342,8 +342,7 @@ /*** 一级供应室审核外来器械 ***/ element = Utils.retryingFind(By .xpath("//button[contains(text(), '进入审核列表')]")); - basket = Utils.settings.getJSONObject("灭菌篮筐01").getString( - "条码"); + basket = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); handleReview(element, review, basket); logger.info("一级供应室审核外来器械完成"); Utils.refresh(); @@ -444,10 +443,7 @@ login.loginAction(); Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15); recyle.recyle_Monitor(); - Utils.waitUntilUrlChange( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); + JSWaiter.waitUntilJQueryReady(); logger.info("供应室回收质量监测登记的重新回收"); recyle.after(); /*** 临床签收物品 ***/ @@ -606,8 +602,11 @@ Utils.refresh(); regular_Monitor.Regular_Monitor_Unqualified(); logger.info("供应室登记定期监测并审核完成"); - afterMethod(); - recyle.init(); + login.login_Out(); + Utils.driver.get(Utils.settings.get("服务器地址").toString() + + "/?logonType=1080p"); + login.loginAction(); + Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15); /*** 供应室回收还物单 ***/ System.out.print("回收还物单开始:"); recyle.recyle_return(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Intervene.java =================================================================== diff -u -r20711 -r20769 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Intervene.java (.../Intervene.java) (revision 20711) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Intervene.java (.../Intervene.java) (revision 20769) @@ -59,8 +59,11 @@ .xpath("//button[contains(text(), '转换为高值耗材')]")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '是')]")); + if (Utils.isFind(Utils.retryingFind(By + .xpath("//button[contains(text(), '是')]")))) { + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '是')]")); + } JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); @@ -148,10 +151,11 @@ .cssSelector("table[class='x-grid3-row-table']")))) { Utils.retryingFindAndClick(By .cssSelector("table[class='x-grid3-row-table']")); - for(int i=0;i<20;i++){ - Utils.retryingFindAndSendKeys( - By.cssSelector("div[class='x-grid3-scroller']"), - Keys.ARROW_RIGHT);} + for (int i = 0; i < 20; i++) { + Utils.retryingFindAndSendKeys( + By.cssSelector("div[class='x-grid3-scroller']"), + Keys.ARROW_RIGHT); + } if (Utils.isFind(Utils.retryingFind(By .cssSelector("input[value='重新拆包']")))) { Utils.retryingFindAndClick(By