Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r26530 -r26540 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26530) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26540) @@ -503,6 +503,8 @@ logger.info("一级供应室补充标示牌并装配完成"); assemble.assemble_dressing(); logger.info("一级供应室装配敷料完成"); + assemble.assemble_tousse(); + logger.info("一级供应室装配器械包完成"); /** 自定义器械包属于常规组,点击常规组装配 */ Utils.refresh(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r26536 -r26540 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 26536) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 26540) @@ -150,6 +150,32 @@ } /** + * 装配器械包 + */ + @Test + public void assemble_tousse() { + try { + scan(); + + Utils.retryingFindAndSendKeys( + By.cssSelector("input[name='basketBarcodeInput']"), + Utils.settings.getJSONObject("一级供应室清洗篮筐2").getString("条码") + + "\n"); + choice(); + Utils.retryingFindAndClick(By.id("save_print")); + /** 获取装配成功后的条码 **/ + JSWaiter.waitUntilJQueryReady(); + Utils.barcodes = Utils.getToussesBarcodes("one"); + logger.info("本次装配条码:" + Utils.barcodes); + logger.info("所有装配条码:" + Utils.oneSupplyReBarcodes); + JSWaiter.waitUntilJQueryReady(); + } catch (Exception e) { + e.printStackTrace(); + fail(e.getMessage()); + } + } + + /** * 中大五院装配成功,在左下角勾选物品装配 */ @Test @@ -1428,7 +1454,7 @@ + name + "')]")); name = Utils.settings.getJSONObject("灭菌程序").getString("名称1"); Utils.retryingFind(By.id("packAmount")).clear(); - Utils.retryingFindAndSendKeys(By.id("packAmount"), "2" + "\n"); + Utils.retryingFindAndSendKeys(By.id("packAmount"), "8" + "\n"); WebElement element = Utils.retryingFind(By.id("sterilingType1")); if (Utils.isFind(element)) { element.click();