Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r20663 -r20720 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20663) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20720) @@ -112,14 +112,13 @@ @Test public void assemble_forgeinSet() { try { - scan(); - + JSWaiter.waitUntilJQueryReady(); Utils.retryingFindAndSendKeys( By.cssSelector("input[name='basketBarcodeInput']"), Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString("条码") + "\n"); - Utils.retryingFindAndClick(By.id("checkAllTaskNode-inputRow")); + scan(); choice(); Utils.retryingFindAndClick(By.id("save_print")); JSWaiter.waitUntilJQueryReady(); @@ -470,11 +469,10 @@ Utils.barcodes = Utils.getToussesBarcodes(); System.out.println("本次装配条码：" + Utils.barcodes); System.out.println("所有装配条码：" + Utils.reBarcodes); - currentwindowhandle = Utils.driver.getWindowHandle(); - Utils.driver.switchTo().window(currentwindowhandle); - - Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); +// currentwindowhandle = Utils.driver.getWindowHandle(); +// Utils.driver.switchTo().window(currentwindowhandle); Utils.switchToDefaultContent(); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); signNum = Utils.settings.getJSONObject("一级供应室器械包1").getString( "标识牌条码2"); if (Utils.isFind(Utils.retryingFind(By @@ -493,10 +491,10 @@ System.out.println("本次装配条码：" + Utils.barcodes); System.out.println("所有装配条码：" + Utils.reBarcodes); } - currentwindowhandle = Utils.driver.getWindowHandle(); - Utils.driver.switchTo().window(currentwindowhandle); - Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); +// currentwindowhandle = Utils.driver.getWindowHandle(); +// Utils.driver.switchTo().window(currentwindowhandle); Utils.switchToDefaultContent(); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); signNum = b; if (Utils.isFind(Utils.retryingFind(By .id("scanIdCardBarcode-inputEl")))) { @@ -773,6 +771,7 @@ System.out.println("所有装配条码：" + Utils.reBarcodes); } } else { + JSWaiter.waitUntilJQueryReady(); scan(); String name = Utils.settings.getJSONObject("灭菌程序").getString( "名称1"); @@ -917,6 +916,7 @@ @Test public void assemble_secondSupplyRoom_QualityMonitoring() { try { + JSWaiter.waitUntilJQueryReady(); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); Utils.retryingFindAndClick(By @@ -930,7 +930,6 @@ By.cssSelector("textarea[name='remark']"), "装配添加质量监测"); Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '保存')]")); - } } catch (Exception e) { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r20663 -r20720 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20663) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20720) @@ -63,7 +63,7 @@ .getString("条码"); String text = Utils.retryingFindAndGetText(By .id("sterilizationUser")); - + // 扫描灭菌炉条码=》灭菌程序条码=》用户条码=》灭菌目的选择“器械包灭菌”=》篮筐或者器械包条码 Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); @@ -101,8 +101,11 @@ Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationRecord")); // 等待表单提交成功 - wait.until(ExpectedConditions.attributeToBe( - Utils.retryingFind(By.id("formSubmitResult")), "value", "1")); + if (Utils.isFind(Utils.retryingFind(By.id("formSubmitResult")))) { + wait.until(ExpectedConditions.attributeToBe( + Utils.retryingFind(By.id("formSubmitResult")), "value", + "1")); + } choiceSterilizationRecord(); Utils.retryingFindAndClick(By.id("sterilizationInterruptBtn")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); @@ -143,18 +146,22 @@ // Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), // Utils.ACTION_SWITCH_TO_FRAME); choiceSterilizationRecord(); - Utils.retryingFindAndClick(By.cssSelector("div[class='x-grid3-scroller']")); - Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT); - Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT); -// Utils.retryingFindAndClick(By.id(sterilizerName + "-" -// + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle")); + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-scroller']")); + Utils.retryingFindAndSendKeys( + By.cssSelector("div[class='x-grid3-scroller']"), + Keys.ARROW_RIGHT); + Utils.retryingFindAndSendKeys( + By.cssSelector("div[class='x-grid3-scroller']"), + Keys.ARROW_RIGHT); + // Utils.retryingFindAndClick(By.id(sterilizerName + "-" + // + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle")); Utils.retryingFindAndClick(By.cssSelector("img[title='重新灭菌']")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); Utils.retryingFindAndClick(By.id("continueBtn")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '是')]"));; - + .xpath("//button[contains(text(), '是')]")); // 灭菌失败 Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationRecord")); @@ -198,15 +205,21 @@ Utils.driver.findElement(By.id("qmSubmitResult")), "value", "1")); JSWaiter.waitUntilJQueryReady(); -// WebElement element = Utils.retryingFind(By.id(sterilizerName + "-" -// + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-failureHandle")); -// if (Utils.isFind(element)) { -// element.click(); -// } + // WebElement element = Utils.retryingFind(By.id(sterilizerName + + // "-" + // + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-failureHandle")); + // if (Utils.isFind(element)) { + // element.click(); + // } choiceSterilizationRecord(); - Utils.retryingFindAndClick(By.cssSelector("div[class='x-grid3-scroller']")); - Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT); - Utils.retryingFindAndSendKeys(By.cssSelector("div[class='x-grid3-scroller']"), Keys.ARROW_RIGHT); + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-scroller']")); + Utils.retryingFindAndSendKeys( + By.cssSelector("div[class='x-grid3-scroller']"), + Keys.ARROW_RIGHT); + Utils.retryingFindAndSendKeys( + By.cssSelector("div[class='x-grid3-scroller']"), + Keys.ARROW_RIGHT); Utils.retryingFindAndClick(By.cssSelector("img[title='重新灭菌']")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); Utils.retryingFindAndClick(By @@ -258,7 +271,7 @@ + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); } else { Utils.refresh(); - Utils.retryingFindAndHover(By.id("sterilizationRecord")); + Utils.retryingFindAndHover(By.id("sterilizationRecord")); Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); Utils.retryingFindAndSwitchToFrame(By @@ -302,14 +315,29 @@ + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)))) { 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 { 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']")); + } } } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20701 -r20720 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20701) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20720) @@ -96,7 +96,7 @@ one.One_use_Entry_success(); System.out.println("一级供应室一次性物品入库完成"); login.login_Out(); - // 二级供应室一次性物品入库 + /*** 二级供应室一次性物品入库 ***/ login.login_secondSupplyRoom(true); Utils.retryingFindAndClick(By.id("enterpriseView")); Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView")); @@ -278,19 +278,19 @@ if (Utils.isFind(element)) { recyle.recyle_customSet(); logger.info("一级供应室消毒物品申请单回收完成"); - afterMethod(); + recyle.after(); } else { - afterMethod(); + recyle.after(); } /*** 一级供应室清洗 ***/ Utils.DateTime(); - // 触摸屏清洗 + /*** 触摸屏清洗 ***/ wash.wash_touch(); afterMethod(); wash.init(); - // 一级供应室清洗并清洗添加材料 + /*** 一级供应室清洗并清洗添加材料 ***/ wash.wash_oneSupplyRoom(); - // 清洗删除篮筐再添加篮筐，扫描不同的责任人 + /*** 清洗删除篮筐再添加篮筐，扫描不同的责任人 ***/ Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '添加')]")); Utils.driver.switchTo().defaultContent(); @@ -302,7 +302,7 @@ Utils.driver.switchTo().defaultContent(); currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - // 清洗失败，重新清洗，清洗完成，清洗机需要设置为清洗确认 + /*** 清洗失败，重新清洗，清洗完成，清洗机需要设置为清洗确认 ***/ wash.wash_fail_reWash_Finish(); logger.info("一级供应室消洗完成"); Utils.driver.switchTo().defaultContent(); @@ -342,7 +342,8 @@ /*** 一级供应室审核外来器械 ***/ 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(); @@ -417,7 +418,7 @@ /*** 一级供应室灭菌装载删除 ***/ disinfection.disinfection_loading(); logger.info("一级供应室灭菌装载删除完成"); - // 一级供应室灭菌 + /*** 一级供应室灭菌 ***/ logger.info("灭菌开始："); SterilizationTest.sterilizationSeriesOperationsOfFristSupplyRoom(); logger.info("一级供应室灭菌完成"); @@ -436,9 +437,23 @@ delivery.Delivery_materials(); logger.info("一级供应室发货材料完成"); login.login_Out(); + /*** 供应室回收质量监测登记的重新回收 ***/ + Utils.switchToDefaultContent(); + Utils.driver.get(Utils.settings.get("服务器地址").toString() + + "/?logonType=1080p"); + login.loginAction(); + Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15); + recyle.recyle_Monitor(); + Utils.waitUntilUrlChange( + SERVER_URL + + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", + 8); + logger.info("供应室回收质量监测登记的重新回收"); + recyle.after(); /*** 临床签收物品 ***/ System.out.print("签收物品开始:"); Utils.DateTime(); + login.init(); login.login_clinicNoWarnig(); sign.Sign_Success(); logger.info("临床签收物品完成"); @@ -604,7 +619,7 @@ /*** 供应室回收终止 ***/ recyle.recyle_terminate(); logger.info("供应室回收终止完成"); - afterMethod(); + recyle.after(); recyle.init(); /*** 供应室二次回收外来器械 ***/ recyle.recyle_Foreign_Twice(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java =================================================================== diff -u -r20663 -r20720 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20663) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20720) @@ -214,6 +214,24 @@ .xpath("//button[contains(text(), '修改')]")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); + if (Utils.isFind(Utils.retryingFind(By.id("reSetWin")))) { + } else { + Utils.refresh(); + Utils.retryingFindAndHover(By.id("reviewPacking")); + Utils.retryingFindAndClick(By.linkText(Utils.settings + .getJSONObject("一级供应室装配组").getString("名称3"))); + Utils.retryingFindAndSwitchToFrame(By + .id("iframe_reviewPacking")); + if (Utils.isFind(Utils.retryingFind(By + .cssSelector("div[class='x-grid3-row-checker']")))) { + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-row-checker']")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '修改')]")); + currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + } + } Utils.retryingFindAndClick(By.id("packer2")); Utils.retryingFindAndSendKeys(By.id("packer2"), Keys.DOWN); String name = Utils.settings.getJSONObject("清点人").getString( Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20701 -r20720 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20701) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20720) @@ -139,6 +139,39 @@ AssertJUnit.fail(e.getMessage()); } } + + /** + * 供应室回收质量监测登记的重新回收 + * */ + @Test + public void recyle_Monitor() { + try { + Utils.retryingFind(By.tagName("body")); + WebElement element = Utils.retryingFindForthCellOfTable(By + .id("awaitForRecycleTable")); + if (Utils.isFind(element)) { + waitUrlChange(); + WebElement recycleForm = this.scanRecycleUserBarcode(); + Utils.retryingFindAndSendKeys(By.id("tousseItemTable"), + Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString("条码") + + "\n"); + dialogWindowClose(); + recycleForm = Utils.retryingFind(By.id("tousseItemTable")); + List addButtons = recycleForm.findElements(By + .cssSelector(".btn-a")); + Utils.retryingFindAndClick(By + .xpath("//tbody/tr/td/a[contains(text(), '+')]")); + for (WebElement addButton : addButtons) { + addButton.click(); + } + dialogWindowClose(); + Utils.retryingFindAndClick(By.id("saveBtn")); + } + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } /** * 二级供应室通过申请单回收