Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Set_manager.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Set_manager.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Set_manager.java (revision 20830) @@ -0,0 +1,85 @@ +package test.forgon.disinfectsystem.selenium; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.Test; +import org.testng.annotations.BeforeMethod; +import org.testng.AssertJUnit; +import org.openqa.selenium.By; +import org.openqa.selenium.Keys; +import org.openqa.selenium.os.WindowsUtils; +import org.openqa.selenium.support.ui.ExpectedConditions; + +import test.forgon.disinfectsystem.selenium.tools.JSWaiter; +import test.forgon.disinfectsystem.selenium.tools.Utils; + +/** + * @author cherry 2017-11-14 + * + */ + +public class Set_manager { + @BeforeMethod + public void init() { + try { + Utils.init(); + Login login = new Login(); + login.login_oneSupplyRoom(); + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + + /** + * 修改器械包定义 + * */ + @Test + public void Update_Set() { + try { + Utils.retryingFindAndClick(By.id("enterpriseView")); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView")); + Utils.retryingFindAndClick(By + .xpath("//div/span[contains(text(), '后台监控管理')]")); + Utils.retryingFindAndClick(By + .xpath("//a/span[contains(text(), '器械包管理')]")); + Utils.retryingFindAndClick(By + .xpath("//a/span[contains(text(), '器械包定义管理')]")); + Utils.retryingFindAndSwitchToFrame(By.id("mainFrame")); + Utils.retryingFindAndClick(By + .xpath("//td/div[contains(text(), '消毒物品')]")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '修改')]")); + String currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + if (Utils.isFind(Utils.retryingFind(By.id("tousseWin")))) { + Utils.retryingFindAndClick(By.id("expressRecycling")); + Utils.retryingFindAndSendKeys(By.id("expressRecycling"), + Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '是')]")); + Utils.retryingFindAndClick(By.id("workLoadStatisticalMethod")); + Utils.retryingFindAndSendKeys( + By.id("workLoadStatisticalMethod"), Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '按包')]")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '保存')]")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '是')]")); + } + JSWaiter.waitUntilJQueryReady(); + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + + @AfterMethod + public void after() { + Utils.driver.quit(); + WindowsUtils.killByName("IEDriverServer.exe"); + WindowsUtils.killByName("iexplore.exe"); + WindowsUtils.killByName("iexplore.exe *32"); + } + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20819 -r20830 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20819) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20830) @@ -1080,36 +1080,29 @@ @Test public void recyle_quickly() { try { - - Utils.retryingFindAndClick(By.xpath("//body/div[1]/div[2]/img[2]")); - - Wait wait = WaitFactory.createDefaultWait(); - WebElement tousseItemTable = wait - .until(new Function() { - public WebElement apply(WebDriver driver) { - return Utils.retryingFind(By.id("tousseItemTable")); - } - }); - tousseItemTable.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐1") - .getString("条码") + "\n"); - List addButtons = tousseItemTable.findElements(By - .cssSelector(".btn-a")); - for (WebElement addButton : addButtons) { - addButton.click(); + Utils.retryingFindAndClick(By.id("quickRecycleImg")); + Utils.waitUntilUrlChange( + Utils.settings.get("服务器地址").toString() + + "/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp?resolution=1980", + 8); + WebElement element = Utils.tryFind(By.id("tousseItemTable")); + if (Utils.isFind(element)) { + element.sendKeys(Utils.settings.getJSONObject("二级供应室清洗篮筐1") + .getString("条码") + "\n"); + dialogWindowClose(); + if (Utils.isFind(Utils.retryingFind(By.id("allIntoBasket")))) { + Utils.retryingFindAndClick(By.id("allIntoBasket")); + } else { + List addButtons = element.findElements(By + .className("btn-a")); + for (WebElement addButton : addButtons) { + Utils.jsClick(addButton); + } + } + Utils.retryingFindAndClick(By.className("btn-e")); + JSWaiter.waitUntilJQueryReady(); } - Utils.retryingFindAndClick(By.cssSelector(".btn-e")); - - for (String winHandle : Utils.driver.getWindowHandles()) { - Utils.driver.switchTo().window(winHandle); - } - - String recyclingFormWindowhandle = Utils.driver.getWindowHandle(); - Utils.driver.switchTo().window(recyclingFormWindowhandle); - Utils.retryingFindAndClick(By.cssSelector(".btn-d")); - wait = WaitFactory.createDefaultWait(); - wait.until(ExpectedConditions.alertIsPresent()); - Alert alertBox = Utils.driver.switchTo().alert(); - alertBox.accept(); + Utils.driver.navigate().back(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20809 -r20830 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20809) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20830) @@ -61,6 +61,7 @@ private Materials materials = new Materials(); private Regular_Monitor regular_Monitor = new Regular_Monitor(); private Recall recall = new Recall(); + private Set_manager set_manager = new Set_manager(); private Intervene intervene = new Intervene(); boolean displayed = false; @@ -85,16 +86,20 @@ } /** - * 一次性物品入库测试 + * 一次性物品入库测试及一级供应室修改消毒物品包定义 */ - public void oneUse() { + public void oneUseAndUpdateSet() { try { /*** 一级供应室一次性物品 ***/ System.out.print("一次性物品开始:"); Utils.DateTime(); one.init(); one.One_use_Entry_success(); System.out.println("一级供应室一次性物品入库完成"); + Utils.refresh(); + /*** 一级供应室修改消毒物品包定义 ***/ + set_manager.Update_Set(); + System.out.println("一级供应室修改消毒物品包定义完成"); login.login_Out(); /*** 二级供应室一次性物品入库 ***/ login.login_secondSupplyRoom(true); @@ -118,7 +123,7 @@ try { initCSSDData(); // 由于省医增加配置一次性物品没库存无法申请,调整一次性物品入库到申请前 - oneUse(); + oneUseAndUpdateSet(); before(); System.out.print("回收开始:"); Utils.DateTime(); @@ -127,6 +132,11 @@ login.login_secondSupplyRoom(false); /** 二级供应室回收 */ /** 二级供应室自定义入筐回收 */ + recyle.recyle_quickly(); + Utils.waitUntilUrlChange( + SERVER_URL + + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", + 8); recyle.recyle_custom(); logger.info("二级供应室自定义入筐回收完成"); Utils.waitUntilUrlChange(