Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java =================================================================== diff -u -r19507 -r19541 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 19507) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 19541) @@ -1077,7 +1077,11 @@ .xpath("//button[contains(text(), '添加')]")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - + if (Utils.isFind(Utils.retryingFind(By.id("scanBarcode")))) { + Utils.retryingFindAndSendKeys(By.id("scanBarcode"), + Utils.settings.getJSONObject("灭菌篮筐01").getString("条码") + + "\n"); + } Utils.retryingFindAndSendKeys(By.id("depart"), Keys.DOWN); String name = Utils.settings.getJSONObject("临床科室").getString("名称"); @@ -1097,23 +1101,26 @@ Utils.retryingFindAndClick(By .xpath("//div/div/div[contains(text(), '" + name + "')]")); Date now = new Date(); + name = Utils.settings.getJSONObject("灭菌程序") + .getString("名称1"); + Utils.retryingFindAndSendKeys(By.id("sterilingType1"), Keys.DOWN); SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd"); Utils.retryingFindAndSendKeys(By.id("sterileStartDate1"), dateFormater.format(now)); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + "')]")); Utils.retryingFindAndSendKeys(By.id("count1"), "2" + "\n"); Utils.retryingFindAndSendKeys(By.id("package1"), Keys.DOWN); - name = Utils.settings.getJSONObject("一级供应室外部代理灭菌包2") .getString("名称"); Utils.retryingFindAndClick(By .xpath("//div/div/div[contains(text(), '" + name + "')]")); + name = Utils.settings.getJSONObject("灭菌程序") + .getString("名称2"); + Utils.retryingFindAndSendKeys(By.id("sterilingType1"), Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + "')]")); Utils.retryingFindAndSendKeys(By.id("count1"), "3" + "\n"); - if (Utils.isFind(Utils.retryingFindAssure(By.id("maker")))){ - Utils.retryingFindAndSendKeys(By.id("maker"), Utils.settings - .getJSONObject("一级供应室配包人").getString("姓名")); - - Utils.retryingFindAndSendKeys(By.id("maker"), "\n"); - } Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '装配并打印标签')]")); @@ -1122,7 +1129,7 @@ Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '是')]")); - + JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage());