Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java =================================================================== diff -u -r20663 -r20843 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java (.../One_use.java) (revision 20663) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java (.../One_use.java) (revision 20843) @@ -95,9 +95,10 @@ + x + "\n"); WebElement supplier = Utils .retryingFind(By.id("supplier1")); - if (supplier.getText() != null) { + if (ExpectedConditions.attributeToBeNotEmpty(supplier, + "value") != null) { + } else { supplier.sendKeys(Keys.DOWN); - supplier.sendKeys("\n"); } Utils.retryingFindAndClick(By @@ -150,10 +151,10 @@ JSWaiter.waitUntilJQueryReady(); // 等待表单提交成功 - if(Utils.isFind(Utils.retryingFind(By.id("formSubmitResult")))){ - wait.until(ExpectedConditions.attributeToBe( - Utils.fluentWaitUntilFind(By.id("formSubmitResult")), - "value", "1")); + if (Utils.isFind(Utils.retryingFind(By.id("formSubmitResult")))) { + wait.until(ExpectedConditions.attributeToBe(Utils + .fluentWaitUntilFind(By.id("formSubmitResult")), + "value", "1")); } // 获取一次性物品入库后的条码 Utils.disposableGoodsBatchBarcodesAfterEntry = Utils Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20830 -r20843 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20830) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20843) @@ -149,7 +149,6 @@ .id("awaitForRecycleTable")); if (Utils.isFind(element)) { recyle.recyle_SecondSupplyRoom(); - Utils.waitUntilUrlChange( SERVER_URL + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", @@ -212,11 +211,22 @@ logger.info("二级供应室审核完成"); disinfection.disinfection_secondSupplyRoom(); logger.info("二级供应室灭菌完成"); + Utils.driver.switchTo().defaultContent(); + Utils.retryingFindAndClick(By + .xpath("//span[contains(text(), '个人桌面')]")); + Utils.retryingFindAndClick(By.id("invoicePlan")); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); + String name = Utils.settings.getJSONObject("临床科室").getString("名称"); + Utils.retryingFindAndClickBySeleniumAPI(By + .xpath("//a[contains(text(), '" + name + "')]")); + Utils.driver.switchTo().defaultContent(); + String currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + delivery.Delivery_secondSupplyRoom(); afterMethod(); recyle.init(); /** 一级供应室回收带标识牌的回收单 */ recyle.recyle_recyleSignboardAndDropAndScrap(); - Utils.waitUntilUrlChange( SERVER_URL + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", @@ -238,7 +248,6 @@ logger.info("一级供应室回收部分终止的单完成"); /** 切换篮筐并丢失材料 */ recyle.recyle_changeBasket(); - Utils.waitUntilUrlChange( SERVER_URL + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", @@ -305,7 +314,7 @@ Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '添加')]")); Utils.driver.switchTo().defaultContent(); - String currentwindowhandle = Utils.driver.getWindowHandle(); + currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); wash.wash_washChangeBasket(); Utils.retryingFindAndClick(By @@ -444,6 +453,8 @@ logger.info("一级供应室自定义发货完成"); delivery.Delivery_TousseAndDressing(); logger.info("一级供应室发货器械包和敷料包完成"); + delivery.Delivery_Agent(); + logger.info("一级供应室发货代理灭菌包完成"); delivery.Delivery_materials(); logger.info("一级供应室发货材料完成"); login.login_Out(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java =================================================================== diff -u -r20276 -r20843 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 20276) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 20843) @@ -240,50 +240,11 @@ } /** - * 一级供应室发货及代理灭菌发货 + * 一级供应室代理灭菌发货 * */ @Test - public void Delivery_oneSupplyRoomAndAgent() { + public void Delivery_Agent() { try { - - Utils.retryingFindAndSendKeys(By.id("senderBarcode"), - Utils.settings.getJSONObject("一级供应室用户").getString("条码") - + "\n"); - - // 整筐发货 - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("灭菌筐02").getString("条码") + "\n"); - - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("灭菌篮筐01").getString("条码") + "\n"); - // 消毒物品固定条码发货 - - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("一级供应室消毒物品").getString("固定条码") + "\n"); - - // 敷料包固定条码发货 - - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("一级供应室敷料包").getString("固定条码") + "\n"); - - // 一次性物品发货 - Utils.retryingFind(By.id("scanText")).clear(); - - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("一级供应室一次性物品").getString("条码1") + "\n"); - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("一级供应室一次性物品").getString("条码2") + "\n"); - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("一级供应室一次性物品").getString("条码3") + "\n"); - - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '保存')]")); - Utils.refresh(); Utils.retryingFindAndClick(By.id("invoicePlan")); Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); @@ -295,19 +256,14 @@ String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); // 代理灭菌发货 - Utils.retryingFindAndSendKeys(By.id("senderBarcode"), Utils.settings.getJSONObject("一级供应室用户").getString("条码") + "\n"); - - for (int i = 0; i < Utils.resendout.size(); i++) { - Utils.retryingFindAndSendKeys(By.id("scanText"), - Utils.resendout.get(i) + "\n"); - } - + Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings + .getJSONObject("灭菌篮筐01").getString("条码") + "\n"); Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '保存')]")); - + JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -320,24 +276,26 @@ @Test public void Delivery_secondSupplyRoom() { try { - Utils.retryingFindAndSendKeys(By.id("senderBarcode"), Utils.settings.getJSONObject("二级供应室用户").getString("条码") + "\n"); - // 整筐发货 Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("二级供应室灭菌篮筐1").getString("条码") + "\n"); - - // 消毒物品固定条码发货 - - Utils.retryingFind(By.id("scanText")).clear(); - Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings - .getJSONObject("二级供应室消毒物品").getString("固定条码") + "\n"); - + .getJSONObject("灭菌篮筐001").getString("条码") + "\n"); + Delivery_FixedBarcodeDisinfection(); + Delivery_Disinfection(); + // 一次性物品发货 + if (CollectionUtils + .isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) { + for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) { + Utils.retryingFindAndClear(By.id("scanText")); + Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + + "\n"); + } + } Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '保存')]")); - + JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage());