Index: ssts-selenium-test/src/test/java/test_4_1/Delivery.java =================================================================== diff -u -r18006 -r18014 --- ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 18006) +++ ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 18014) @@ -439,7 +439,53 @@ AssertJUnit.fail(e.getMessage()); } } + + /** + * 自定义发货 + * */ + @Test + public void Delivery_custom() { + try { + Utils.driver.navigate().refresh(); + String currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + Utils.tryToCloseWarningWindow(); + Utils.retryingFindAndClick(By.id("enterpriseView")); + WebElement frame = Utils.retryingFindAndSwitchToFrame(By + .id("iframe_enterpriseView")); + Utils.retryingFindAndClick( + By.xpath("//div/a/span[contains(text(), '发货管理')]")); + Utils.retryingFindAndClick( + By.xpath("//div/a/span[contains(text(), '自定义发货')]")); + frame = Utils.retryingFindAndSwitchToFrame(By.id("mainFrame")); + + currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + + Utils.retryingFindAndSendKeys(By.id("departBarcode"), + Utils.settings.getJSONObject("临床科室").getString("条码") + + "\n"); + Utils.retryingFindAndSendKeys(By.id("senderBarcode"), + Utils.settings.getJSONObject("一级供应室用户").getString("条码") + + "\n"); + + String barcode = Utils.getSeleniumRuntimeData().getInsideTousseBarcode(); + // 器械包条码 + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); + barcode = Utils.getSeleniumRuntimeData().getDressingTousseBarcode(); + // 敷料包条码 + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); + + Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]")); + + Thread.sleep(10*1000); + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + @AfterMethod public void after() { Utils.driver.quit();