Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r21065 -r21203 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 21065) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 21203) @@ -238,19 +238,17 @@ Utils.retryingFindAndClick(By.id("completeSterilizationBtn")); Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); - try { // 有的医院需要扫描灭菌完成确认人 - if (Utils.isFind(Utils.retryingFind(By - .id("completeUserBarcode")))) { - Utils.retryingFindAndSendKeys(By.id("completeUserBarcode"), - cssduser1Barcode + "\n"); - Utils.retryingFindAndClickByJavaScript(By.id("saveBtn")); - } - } catch (Exception e1) { + // 有的医院需要扫描灭菌完成确认人 + if (Utils.isFind(Utils.retryingFind(By.id("completeUserBarcode")))) { + Utils.retryingFindAndSendKeys(By.id("completeUserBarcode"), + cssduser1Barcode + "\n"); + Utils.retryingFindAndClickByJavaScript(By.id("saveBtn")); + } else if (Utils.isFind(Utils.retryingFind(By + .xpath("//button[contains(text(), '是')]")))) { // 这里报错说明不需要扫描灭菌完成确认人 Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '是')]")); } - Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationRecord")); try { @@ -313,9 +311,9 @@ calendar.add(Calendar.MINUTE, 2); if (Utils.isFind(Utils.retryingFind(By .id("biologicalMonitoringEndDate")))) { - Utils.retryingFindAndSendKeys( - By.id("biologicalMonitoringEndDate"), - sdf.format(calendar.getTime())); + Utils.retryingFindAndSendKeys( + By.id("biologicalMonitoringEndDate"), + sdf.format(calendar.getTime())); } Utils.retryingFindAndSendKeys(By.id("monitorUserBarcode"), cssduser1Barcode + "\n"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r21098 -r21203 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 21098) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 21203) @@ -185,9 +185,8 @@ login.login_oneSupplyRoom(); disinfection.disinfection_agent(); logger.info("二级供应室装配后做代理灭菌完成"); - recyle.after(); + login.login_Out(); /** 二级供应室装配敷料 */ - login.init(); login.login_secondSupplyRoom(); assemble.assemble_secondSupplyRoomdressing(); logger.info("二级供应室装配敷料完成"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r21191 -r21203 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 21191) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 21203) @@ -955,7 +955,10 @@ By.cssSelector("input[name='basketBarcodeInput']"), Utils.settings.getJSONObject("二级供应室清洗篮筐1").getString("条码") + "\n"); - + Utils.retryingFindAndSendKeys( + By.cssSelector("input[name='basketBarcodeInput']"), + Utils.settings.getJSONObject("二级供应室清洗篮筐2").getString("条码") + + "\n"); Utils.retryingFindAndClick(By.id("checkAllTaskNode-inputRow")); Utils.retryingFindAndClick(By.id("sterilingType-triggerWrap")); Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json =================================================================== diff -u -r20982 -r21203 --- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json (.../settings.json) (revision 20982) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json (.../settings.json) (revision 21203) @@ -1,5 +1,5 @@ { - "seleniumBrowserApplicationName": "sen11", + "seleniumBrowserApplicationName": "11", "seleniumBrowserVersion": "11.0", "seleniumHubURL": "http://192.168.2.20:4445/wd/hub", "服务器地址": "http://192.168.2.111/gdsy", @@ -180,8 +180,8 @@ "名称": "清洗篮筐120" }, "二级供应室清洗篮筐2": { - "条码": "", - "名称": "" + "条码": "019000006", + "名称": "清洗篮筐121" }, "二级供应室清洗篮筐3": { "条码": "", Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java =================================================================== diff -u -r21037 -r21203 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 21037) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 21203) @@ -558,6 +558,8 @@ Utils.driver.findElement(By.id("personInCharge")), "value")); Utils.retryingFindAndSendKeys(By.id("inputText"), Utils.settings .getJSONObject("二级供应室清洗篮筐1").getString("条码") + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputText"), Utils.settings + .getJSONObject("二级供应室清洗篮筐2").getString("条码") + "\n"); // Utils.retryingFindAndSendKeys(By.id("cycleCounter"),x+"\n"); Utils.retryingFindAndClick(By.id("saveBtn")); JSWaiter.waitUntilJQueryReady(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r21187 -r21203 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 21187) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 21203) @@ -322,7 +322,8 @@ .findElements(By .cssSelector("input[name^='loadedAmount']")); for (WebElement loadedAmount : loadedAmounts) { - if (loadedAmount.getText()!=null&&loadedAmount.getText().equals("0")) { + if (loadedAmount.getText() != null + && loadedAmount.getText().equals("0")) { for (WebElement addButton : addButtons) { // click之前等待页面加载完毕 JSWaiter.waitUntilJQueryReady(); @@ -1297,10 +1298,16 @@ Wait wait = WaitFactory.createDefaultWait(); wait.until(ExpectedConditions.attributeToBe( By.id("seleniumResult"), "value", "1")); + Utils.retryingFindAndClick(By.className("btn-a")); + basket = Utils.settings.getJSONObject("二级供应室清洗篮筐2").getString("条码"); + actions.moveToElement(recycleForm).sendKeys(basket + "\n") + .perform(); + dialogWindowClose(); List addButtons = recycleForm.findElements(By .className("btn-a")); for (WebElement addButton : addButtons) { Utils.jsClick(addButton); + dialogWindowClose(); // addButton.click(); } Utils.retryingFindAndClick(By.className("btn-e"));