Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20769 -r20778 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20769) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20778) @@ -171,6 +171,7 @@ /** 二级供应室装配 */ assemble.assemble_secondSupplyRoomSet(); assemble.assemble_secondSupplyRoom_QualityMonitoring(); + assemble.assemble_secondSupplyRoom_Print_Recyle_List(); logger.info("二级供应室装配完成"); login.login_Out(); /** 二级供应室装配后做代理灭菌 */ @@ -602,22 +603,16 @@ Utils.refresh(); regular_Monitor.Regular_Monitor_Unqualified(); logger.info("供应室登记定期监测并审核完成"); + Utils.refresh(); 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(); - logger.info("供应室回收还物单完成"); - Utils.waitUntilUrlChange( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - /*** 供应室回收终止 ***/ - recyle.recyle_terminate(); - logger.info("供应室回收终止完成"); + logger.info("供应室回收还物单和回收终止完成"); recyle.after(); recyle.init(); /*** 供应室二次回收外来器械 ***/ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20769 -r20778 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20769) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20778) @@ -150,9 +150,9 @@ WebElement element = Utils.retryingFindForthCellOfTable(By .id("awaitForRecycleTable")); if (Utils.isFind(element)) { - String barcode = Utils.settings.getJSONObject("临床科室").getString( - "条码"); - Utils.retryingFindAndSendKeys(By.tagName("body"), barcode + "\n"); +// 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 @@ -415,7 +415,7 @@ } /** - * 一级供应室回收还物单 + * 一级供应室回收还物单,且在有还物单的情况下才做回收终止 * */ @Test public void recyle_return() { @@ -444,6 +444,14 @@ } Utils.retryingFindAndClick(By.id("saveBtn")); + String SERVER_URL = Utils.settings.get("服务器地址").toString(); + Utils.waitUntilUrlChange( + SERVER_URL + + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", + 8); + /*** 供应室回收终止 ***/ + recyle_terminate(); + logger.info("供应室回收终止完成"); } } catch (Exception e) { e.printStackTrace(); @@ -879,14 +887,15 @@ Utils.retryingFindAndClick(By.id("appTypeSelect")); Utils.retryingFindAndClick(By .cssSelector("option[value='(待回收)外来器械包申请单']")); + Utils.retryingFindAndSendKeys(By.id("appTypeSelect"),"\n"); String a = Utils.settings.getJSONObject("临床科室").getString("条码"); WebElement element = Utils.retryingFind(By .id("awaitForRecycleTable")); if (Utils.isFind(element)) { List allRows = element.findElements(By .tagName("tr")); System.out.println("rows size = " + allRows.size()); - if (allRows.size() > 1) { + if (allRows.size() >= 1) { // 输入临床科室条码，只显示临床科室的申请单 Utils.retryingFindAndSendKeys(By.tagName("body"), a + "\n"); if (Utils.isFind(Utils.retryingFind(By Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java =================================================================== diff -u -r20609 -r20778 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 20609) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 20778) @@ -883,7 +883,7 @@ String text = cell.getText(); if (text != null) { if (text.equals("自定义器械包申请单") - || text.equals("消毒物品申请单")) { + || text.equals("消毒物品申请单")|| text.equals("质量监测回收申请单")) { result = cell; break; } else { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r20720 -r20778 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20720) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 20778) @@ -469,8 +469,8 @@ Utils.barcodes = Utils.getToussesBarcodes(); System.out.println("本次装配条码：" + Utils.barcodes); System.out.println("所有装配条码：" + Utils.reBarcodes); -// currentwindowhandle = Utils.driver.getWindowHandle(); -// Utils.driver.switchTo().window(currentwindowhandle); + // currentwindowhandle = Utils.driver.getWindowHandle(); + // Utils.driver.switchTo().window(currentwindowhandle); Utils.switchToDefaultContent(); Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); signNum = Utils.settings.getJSONObject("一级供应室器械包1").getString( @@ -491,8 +491,8 @@ System.out.println("本次装配条码：" + Utils.barcodes); System.out.println("所有装配条码：" + Utils.reBarcodes); } -// currentwindowhandle = Utils.driver.getWindowHandle(); -// Utils.driver.switchTo().window(currentwindowhandle); + // currentwindowhandle = Utils.driver.getWindowHandle(); + // Utils.driver.switchTo().window(currentwindowhandle); Utils.switchToDefaultContent(); Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); signNum = b; @@ -539,6 +539,37 @@ } /** + * 二级供应装配界面打印回收清单 + ***/ + @Test + public void assemble_secondSupplyRoom_Print_Recyle_List() { + try { + JSWaiter.waitUntilJQueryReady(); + Utils.driver.switchTo().defaultContent(); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); + Utils.retryingFindAndClick(By + .xpath("//span[contains(text(), '打印回收清单')]")); + Utils.retryingFindAndClick(By.id("chooseRecyclingDetailWin")); + if (Utils.isFind(Utils.retryingFind(By + .xpath("//button[contains(text(), '打印')]")))) { + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '打印')]")); + if (Utils.isFind(Utils.retryingFind(By.id("extTipMsg")))) { + System.out.print("未配置打印回收清单!"); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '取消')]")); + } else { + JSWaiter.waitUntilJQueryReady(); + } + } + JSWaiter.waitUntilJQueryReady(); + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + + /** * 报损补充 */ @Test @@ -1127,58 +1158,60 @@ element1.click(); currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); + if (Utils.isFind(Utils.retryingFind(By.id("comboTousseWin")))) { + Utils.retryingFindAndClick(By.id("comboTousseWin")); + // 输入条码 + Utils.retryingFindAndSendKeys(By + .id("packerBarcode3-inputEl"), Utils.settings + .getJSONObject("一级供应室用户").getString("条码") + "\n"); + Utils.retryingFindAndSendKeys(By + .id("reviewerBarcode3-inputEl"), Utils.settings + .getJSONObject("一级供应室用户").getString("条码") + "\n"); - // 输入条码 - Utils.retryingFindAndSendKeys(By.id("packerBarcode3-inputEl"), - Utils.settings.getJSONObject("一级供应室用户").getString("条码") - + "\n"); - Utils.retryingFindAndSendKeys( - By.id("reviewerBarcode3-inputEl"), Utils.settings - .getJSONObject("一级供应室用户").getString("条码") - + "\n"); - - // 聚合包 - WebElement element2 = Utils.retryingFind(By - .id("comboTousseName-inputEl")); - if (Utils.isFind(element2)) { - element2.sendKeys(Keys.DOWN); - Utils.fluentWaitUntilFind((By - .xpath("//div/ul/li[contains(text(), '" + "Test聚合包" - + "')]"))); + // 聚合包 + WebElement element2 = Utils.retryingFind(By + .id("comboTousseName-inputEl")); + if (Utils.isFind(element2)) { + element2.sendKeys(Keys.DOWN); + Utils.fluentWaitUntilFind((By + .xpath("//div/ul/li[contains(text(), '" + + "Test聚合包" + "')]"))); + Utils.retryingFindAndClick(By + .xpath("//div/ul/li[contains(text(), '" + + "Test聚合包" + "')]")); + } + } + // 灭菌程序 + WebElement element = Utils.retryingFind(By + .id("sterilingType3-inputEl")); + String name = Utils.settings.getJSONObject("灭菌程序").getString( + "名称2"); + if (Utils.isFind(element)) { + element.click(); + element.sendKeys(Keys.DOWN); Utils.retryingFindAndClick(By - .xpath("//div/ul/li[contains(text(), '" + "Test聚合包" + .xpath("//div/div/ul/li[contains(text(), '" + name + "')]")); } - } - // 灭菌程序 - WebElement element = Utils.retryingFind(By - .id("sterilingType3-inputEl")); - String name = Utils.settings.getJSONObject("灭菌程序").getString("名称2"); - if (Utils.isFind(element)) { - element.click(); - element.sendKeys(Keys.DOWN); - Utils.retryingFindAndClick(By - .xpath("//div/div/ul/li[contains(text(), '" + name - + "')]")); - } - // 点击拆分按钮 - Utils.retryingFindAndClick(By - .xpath("//span/span/span[contains(text(), '>>>>')]")); - // 点击确定 - Utils.retryingFindAndClick(By - .xpath("//span/span/span[contains(text(), '确定')]")); - // 点击装配按钮 - Utils.retryingFindAndClick(By - .xpath("//span/span/span[contains(text(), '装配并打印标签')]")); - JSWaiter.waitUntilJQueryReady(); - if (Utils.isFind(Utils.retryingFind(By.id("comboTousseWin")))) { - System.out.print("聚合包窗口未消失"); - if (Utils - .isFind(Utils.retryingFind(By - .cssSelector("img[class='x4-tool-img x4-tool-close']")))) { - Utils.retryingFindAndClick(By - .cssSelector("img[class='x4-tool-img x4-tool-close']")); + // 点击拆分按钮 + Utils.retryingFindAndClick(By + .xpath("//span/span/span[contains(text(), '>>>>')]")); + // 点击确定 + Utils.retryingFindAndClick(By + .xpath("//span/span/span[contains(text(), '确定')]")); + // 点击装配按钮 + Utils.retryingFindAndClick(By + .xpath("//span/span/span[contains(text(), '装配并打印标签')]")); + JSWaiter.waitUntilJQueryReady(); + if (Utils.isFind(Utils.retryingFind(By.id("comboTousseWin")))) { + System.out.print("聚合包窗口未消失"); + if (Utils + .isFind(Utils.retryingFind(By + .cssSelector("img[class='x4-tool-img x4-tool-close']")))) { + Utils.retryingFindAndClick(By + .cssSelector("img[class='x4-tool-img x4-tool-close']")); + } } } } catch (Exception e) {