Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r19060 -r19071 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19060) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19071) @@ -6,6 +6,7 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.List; +import java.util.Set; import java.util.function.Function; import net.sf.json.JSONObject; @@ -91,14 +92,19 @@ @Test public void recyle_oneSupplyRoom() { try { + String barcode = Utils.settings.getJSONObject("临床科室").getString( "条码"); - // 输入临床科室条码,只显示临床科室的申请单 Utils.retryingFindAndSendKeys(By.tagName("body"), barcode + "\n"); - Utils.retryingFindClickFirstCellOfTable(By .id("awaitForRecycleTable")); + Utils.waitForWindowAmountEquals(1, 8000); + Utils.switchToDefaultContent(); +// JSWaiter.waitUntilJQueryReady(); + Utils.jsClick(Utils.findByAwait(By.xpath("html/body/div[2]/div[1]/form/div[1]/input"))); + Utils.isFind(Utils.findByAwait(By.id("tousseItemTable"))); + // waitUrlChange(); // 获取器械包的器械(材料)清单表格 @@ -1139,8 +1145,9 @@ this.logger.info("扫描回收人条码成功");} // Utils.doWait(500); // 扫描清点人条码 + if(Utils.isFind(Utils.findByAwait(By.id("operator")))){ table = this.scanBarcode(By.id("operator"), "清点人"); - this.logger.info("扫描清点人条码成功"); + this.logger.info("扫描清点人条码成功");} // Utils.doWait(500); } catch (Exception e) { e.printStackTrace();