Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r20970 -r20979 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20970) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20979) @@ -323,29 +323,19 @@ Utils.retryingFindAndClick(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); JSWaiter.waitUntilJQueryReady(); + } else if (Utils.retryingFind( + By.cssSelector("div[class='x-grid3-row-checker']")) + .isSelected()) { + JSWaiter.waitUntilJQueryReady(); } else { - if (Utils.retryingFind( - By.cssSelector("div[class='x-grid3-row-checker']")) - .isSelected()) { - JSWaiter.waitUntilJQueryReady(); - } else { - Utils.retryingFindAndClick(By - .cssSelector("div[class='x-grid3-row-checker']")); - JSWaiter.waitUntilJQueryReady(); - if (Utils.retryingFind( - By.cssSelector("div[class='x-grid3-row-checker']")) - .isSelected()) { - } else { - Utils.refresh(); - Utils.retryingFindAndHover(By.id("sterilizationRecord")); - Utils.retryingFindAndClick(By.linkText(Utils.settings - .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); - Utils.retryingFindAndSwitchToFrame(By - .id("iframe_sterilizationRecord")); - Utils.retryingFindAndClick(By - .cssSelector("div[class='x-grid3-row-checker']")); - } - } + Utils.refresh(); + Utils.retryingFindAndHover(By.id("sterilizationRecord")); + Utils.retryingFindAndClick(By.linkText(Utils.settings + .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); + Utils.retryingFindAndSwitchToFrame(By + .id("iframe_sterilizationRecord")); + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-row-checker']")); } } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r20878 -r20979 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20878) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20979) @@ -464,7 +464,15 @@ Utils.retryingFindAndSendKeys( By.id("scanIdCardBarcode-inputEl"), signNum + "\n"); scan(); - choice(); + element = Utils.retryingFind(By + .cssSelector("input[name='sterilingType']")); + String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1"); + if (Utils.isFind(element)) { + element.click(); + element.sendKeys(Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/ul/li[contains(text(), '" + name + "')]")); + } Utils.retryingFindAndClick(By.id("save_print")); /** 获取装配成功后的条码 **/ Utils.barcodes = Utils.getToussesBarcodes(); @@ -485,7 +493,15 @@ Utils.retryingFind(By.id("scanIdCardBarcode-inputEl")) .sendKeys(signNum + "\n"); scan(); - choice(); + element = Utils.retryingFind(By + .cssSelector("input[name='sterilingType']")); + name = Utils.settings.getJSONObject("灭菌程序").getString("名称1"); + if (Utils.isFind(element)) { + element.click(); + element.sendKeys(Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/ul/li[contains(text(), '" + name + "')]")); + } Utils.retryingFindAndClick(By.id("save_print")); /** 获取装配成功后的条码 **/ Utils.barcodes = Utils.getToussesBarcodes(); @@ -508,7 +524,7 @@ scan(); element = Utils.retryingFind(By .cssSelector("input[name='sterilingType']")); - String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1"); + name = Utils.settings.getJSONObject("灭菌程序").getString("名称1"); if (Utils.isFind(element)) { element.click(); element.sendKeys(Keys.DOWN); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20970 -r20979 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20970) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20979) @@ -186,7 +186,7 @@ login.login_oneSupplyRoom(); disinfection.disinfection_agent(); logger.info("二级供应室装配后做代理灭菌完成"); - afterMethod(); + recyle.after(); /** 二级供应室装配敷料 */ login.init(); login.login_secondSupplyRoom(); @@ -223,7 +223,7 @@ Utils.driver.switchTo().window(currentwindowhandle); delivery.Delivery_secondSupplyRoom(); userrecord.UserRecord_success(); - afterMethod(); + recyle.after(); recyle.init(); /** 一级供应室回收带标识牌的回收单 */ recyle.recyle_recyleSignboardAndDropAndScrap(); @@ -306,7 +306,7 @@ Utils.DateTime(); /*** 触摸屏清洗 ***/ wash.wash_touch(); - afterMethod(); + recyle.after(); wash.init(); /*** 一级供应室清洗并清洗添加材料 ***/ wash.wash_oneSupplyRoom(); @@ -641,6 +641,8 @@ Utils.retryingFindAndClick(By .xpath("//span[contains(text(), '个人桌面')]")); /*** 供应室召回一次性物品、器械包 ***/ + login.init(); + login.login_oneSupplyRoom(); System.out.print("召回开始："); recall.Recall_One_use(); Utils.refresh(); @@ -651,6 +653,7 @@ login.login_Out(); Utils.driver.get(Utils.settings.get("服务器地址").toString() + "/?logonType=1080p"); + Utils.waitUntilUrlContains("/?logonType=1080p", 15); login.loginAction(); Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15); /*** 供应室回收还物单和回收终止 ***/ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java =================================================================== diff -u -r20720 -r20979 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20720) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20979) @@ -74,20 +74,19 @@ Utils.reBarcodes.get(i) + "\n"); } } - Utils.retryingFindAndSendKeys(By.id("barcode"), basket + "\n"); - + if (Utils.isFind(Utils.retryingFind(By.id("barcode")))) { + Utils.retryingFindAndClick(By.id("barcode")); + Utils.retryingFindAndSendKeys(By.id("barcode"), basket + "\n"); + } Utils.retryingFindAndClick(By .xpath("//button/b[contains(text(), '审核')]")); Actions click = new Actions(Utils.driver); WebElement element = Utils.retryingFind(By .xpath("//button[contains(text(), '是')]")); - if (Utils.isFind(element)) { - Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '是')]")); } - Utils.driver.switchTo().defaultContent(); JSWaiter.waitUntilJQueryReady(); Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); @@ -111,15 +110,22 @@ b = b.substring(b.indexOf("0"), b.indexOf("0") + 9); Utils.reBarcodes.add(b); System.out.println("所有装配的条码:" + Utils.reBarcodes); - Utils.retryingFindAndSendKeys(By.id("barcode"), b - + "\n"); + if (Utils.isFind(Utils.retryingFind(By + .id("barcode")))) { + Utils.retryingFindAndClick(By.id("barcode")); + Utils.retryingFindAndSendKeys(By.id("barcode"), + b + "\n"); + } continue; } else { break; } } - Utils.retryingFindAndSendKeys(By.id("barcode"), basket - + "\n"); + if (Utils.isFind(Utils.retryingFind(By.id("barcode")))) { + Utils.retryingFindAndClick(By.id("barcode")); + Utils.retryingFindAndSendKeys(By.id("barcode"), basket + + "\n"); + } click = new Actions(Utils.driver); element = Utils.retryingFind(By .xpath("//button[contains(text(), '是')]")); @@ -141,9 +147,7 @@ Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '是')]")); } - Utils.driver.switchTo().defaultContent(); - Utils.retryingFindAndSwitchToFrame(By .id("iframe_reviewPacking")); JSWaiter.waitUntilJQueryReady();