Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r19800 -r19936 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19800) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19936) @@ -30,9 +30,9 @@ @Test public static void sterilizationSeriesOperationsOfFristSupplyRoom() { try { -// Utils.init(); -// Login login = new Login(); -// login.login_oneSupplyRoom(); + // Utils.init(); + // Login login = new Login(); + // login.login_oneSupplyRoom(); Wait wait = WaitFactory.createDefaultWait(); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By @@ -102,10 +102,21 @@ .id("iframe_sterilizationRecord")); // 等待表单提交成功 wait.until(ExpectedConditions.attributeToBe( - Utils.driver.findElement(By.id("formSubmitResult")), - "value", "1")); - Utils.retryingFindAndClick(By.id(sterilizerName + "-" - + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); + Utils.retryingFind(By.id("formSubmitResult")), "value", "1")); + if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-" + + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) { + Utils.retryingFindAndClick(By.id(sterilizerName + "-" + + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); + } else { + if (Utils.retryingFind( + By.cssSelector("div[class='x-grid3-row-checker']")) + .isSelected()) { + + } else { + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-row-checker']")); + } + } Utils.retryingFindAndClick(By.id("sterilizationInterruptBtn")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); Utils.retryingFindAndClick(By @@ -247,8 +258,23 @@ // 这里报错说明不需要灭菌卸载、或者灭菌确认 } // 填写灭菌监测 - Utils.retryingFindAndClick(By.id(sterilizerName + "-" - + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); + if (Utils.isFind(Utils.retryingFind(By.id(sterilizerName + "-" + + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) { + Utils.retryingFindAndClick(By.id(sterilizerName + "-" + + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); + } else { + Utils.refresh(); + moveover = new Actions(Utils.driver); + moveover.moveToElement( + Utils.retryingFind(By.id("sterilizationRecord"))) + .perform(); + Utils.retryingFindAndClick(By.linkText(Utils.settings + .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); + Utils.retryingFindAndSwitchToFrame(By + .id("iframe_sterilizationRecord")); + Utils.retryingFindAndClick(By.id(sterilizerName + "-" + + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); + } Utils.retryingFindAndClick(By.id("modifyBtn")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); String javaScript = "Ext.getCmp('physicsResult').setValue('合格');"; @@ -271,6 +297,7 @@ Utils.retryingFindAndSendKeys(By.id("monitorCheckerBarcode"), cssduser1Barcode + "\n"); Utils.retryingFindAndClick(By.id("monitorBtn")); + JSWaiter.waitUntilJQueryReady(); Utils.driver.quit(); } catch (Exception e) { e.printStackTrace();