Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20146 -r20152 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20146) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20152) @@ -446,6 +446,15 @@ Utils.retryingFindAndClick(By .xpath("//div/a/span[contains(text(), '一次性物品管理')]")); one.One_use_allot_success(); + /*** 供应室一次性物品盘点 ***/ + Utils.refresh(); + Utils.retryingFindAndClick(By.id("enterpriseView")); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView")); + Utils.retryingFindAndClick(By + .xpath("//div/span[contains(text(), '后台监控管理')]")); + Utils.retryingFindAndClick(By + .xpath("//div/a/span[contains(text(), '一次性物品管理')]")); + one.One_use_check(); one.after(); } catch (Exception e) { logger.error(e, e); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java =================================================================== diff -u -r20146 -r20152 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java (.../One_use.java) (revision 20146) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java (.../One_use.java) (revision 20152) @@ -12,6 +12,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.os.WindowsUtils; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Wait; @@ -260,16 +261,6 @@ .xpath("//button[contains(text(), '添加盘点记录')]")); Utils.retryingFindAndClick(By.id("saveBtn")); JSWaiter.waitUntilJQueryReady(); - Utils.refresh(); - Utils.retryingFindAndClick(By.id("enterpriseView")); - Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView")); - Utils.retryingFindAndClick(By - .xpath("//div/span[contains(text(), '后台监控管理')]")); - Utils.retryingFindAndClick(By - .xpath("//div/a/span[contains(text(), '一次性物品管理')]")); - Utils.retryingFindAndClick(By - .xpath("//div/a/span[contains(text(), '一次性物品盘点管理')]")); - Utils.retryingFindAndSwitchToFrame(By.id("mainFrame")); if (Utils.isFind(Utils.retryingFind(By .xpath("//div[contains(text(), '未更新')]")))) { Utils.retryingFindAndClick(By @@ -278,8 +269,29 @@ + dateFormater.format(now) + "')]")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - Utils.retryingFindAndClick(By - .xpath("//em/button[contains(text(), '盘点数据初始化')]")); + if (Utils.isFind(Utils.retryingFind(By.id("inventoryItemWin")))) { + Utils.retryingFindAndClick(By + .cssSelector("button[class='x-btn-text icon_set']")); + By element = By + .cssSelector("div[class='x-grid3-cell-inner x-grid3-col-9']"); + Utils.retryingFindAndClick(element); + Actions actions = new Actions(Utils.driver); + actions.moveToElement(Utils.retryingFind(element)).click() + .perform(); + actions.moveToElement(Utils.retryingFind(element)) + .sendKeys("10" + "\n").perform(); + actions.moveToElement(Utils.retryingFind(element)) + .sendKeys(Keys.BACK_SPACE).perform(); + actions.moveToElement(Utils.retryingFind(element)) + .sendKeys(Keys.BACK_SPACE).perform(); + actions.moveToElement(Utils.retryingFind(element)) + .sendKeys(Keys.BACK_SPACE).perform(); + actions.moveToElement(Utils.retryingFind(element)) + .sendKeys("2" + "\n").perform(); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '更新库存并结算')]")); + JSWaiter.waitUntilJQueryReady(); + } } } catch (Exception e) { e.printStackTrace();