Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r26427 -r26431 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26431) @@ -283,10 +283,8 @@ String name = Utils.settings.getJSONObject("临床科室").getString("名称"); delivery.openInvoiceWindow(name); delivery.Delivery_secondSupplyRoom(); -// login.login_Out(); /** 二级供应室录入使用记录 */ -// LoginUtil.loginWithClinical(); userrecord.UserRecord_success(); login.login_Out(); Utils.driver.get(Utils.settings.get("服务器地址").toString() Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java =================================================================== diff -u -r26427 -r26431 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 26431) @@ -426,21 +426,21 @@ } //取发货物品表格的第一列(即条码列),若为一次性物品条码,则将其放进Utils.disposableGoodsBatchBarcodesForInvoice中 - List sendOutGoodsTables = Utils.driver.findElements(By.xpath("//*[@id='sendOutGoods']/div[1]/div[2]/div[1]/div[1]/div[2]/div[1]//tbody")); - if(sendOutGoodsTables!=null){ - Utils.disposableGoodsBatchBarcodesForInvoice.clear(); - for(WebElement table : sendOutGoodsTables){ - List trs= table.findElements(By.tagName("tr")); - for(int i=0;i tds = trs.get(i).findElements(By.tagName("td")); - WebElement barcodeDiv = tds.get(0).findElement(By.tagName("div")); - if(Utils.disposableGoodsBatchBarcodesAfterEntry.contains(barcodeDiv.getText())){ - Utils.disposableGoodsBatchBarcodesForInvoice.add(barcodeDiv.getText()); - logger.info("发货的一次性物品条码为:"+barcodeDiv.getText()); - } - } - } - } +// List sendOutGoodsTables = Utils.driver.findElements(By.xpath("//*[@id='sendOutGoods']/div[1]/div[2]/div[1]/div[1]/div[2]/div[1]//tbody")); +// if(sendOutGoodsTables!=null){ +// Utils.disposableGoodsBatchBarcodesForInvoice.clear(); +// for(WebElement table : sendOutGoodsTables){ +// List trs= table.findElements(By.tagName("tr")); +// for(int i=0;i tds = trs.get(i).findElements(By.tagName("td")); +// WebElement barcodeDiv = tds.get(0).findElement(By.tagName("div")); +// if(Utils.disposableGoodsBatchBarcodesAfterEntry.contains(barcodeDiv.getText())){ +// Utils.disposableGoodsBatchBarcodesForInvoice.add(barcodeDiv.getText()); +// logger.info("发货的一次性物品条码为:"+barcodeDiv.getText()); +// } +// } +// } +// } Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]")); JSWaiter.waitUntilJQueryReady();