Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java =================================================================== diff -u -r21065 -r21325 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 21065) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 21325) @@ -1228,7 +1228,9 @@ Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings.getJSONObject("灭菌篮筐001").getString("条码") + "\n"); - Utils.retryingFindAndClick(By + JSWaiter.waitUntilJQueryReady(); + if(Utils.isFind(Utils.retryingFind(By.cssSelector("a[class='x-tree-node-anchor']")))){ + Utils.retryingFindAndClickByJavaScript(By .xpath("//button[contains(text(), '保存')]")); Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationRecord")); @@ -1272,6 +1274,11 @@ if (Utils.isFind(element)) { confirm_One(); } + }} + else{ + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '取消')]")); + System.out.print("没有待灭菌的物品"); } JSWaiter.waitUntilJQueryReady(); } catch (Exception e) {