Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java =================================================================== diff -u -r26574 -r26575 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 26574) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 26575) @@ -1237,20 +1237,20 @@ .getJSONObject("灭菌篮筐03").getString("条码") + "\n"); if (Utils.agentDisinfectionBarcodes.isEmpty()) { } else { - //将4个包留下来不作为代理灭菌,留给二级供应室处理,否则一级供应室回收二级供应室转化的申请单的时候将会无器械包可回收 - for (int i = 0; i < Utils.agentDisinfectionBarcodes.size()-4; i++) { + //将2个包留下来不作为代理灭菌,留给二级供应室处理,否则一级供应室回收二级供应室转化的申请单的时候将会无器械包可回收 + for (int i = 0; i < Utils.agentDisinfectionBarcodes.size()-2; i++) { Utils.retryingFindAndSendKeys(By.id("package1"), Utils.agentDisinfectionBarcodes.get(i) + "\n"); } logger.info("代理灭菌器械包扫描成功"); - //将此4个包放进Utils.secondSupplyReBarcodes,待二级供应室处理 + //将此2个包放进Utils.secondSupplyReBarcodes,待二级供应室处理 List tempBarcodes = new ArrayList(); - for(int i=Utils.agentDisinfectionBarcodes.size()-1;i>=Utils.agentDisinfectionBarcodes.size()-4;i--){ + for(int i=Utils.agentDisinfectionBarcodes.size()-1;i>=Utils.agentDisinfectionBarcodes.size()-2;i--){ tempBarcodes.add(Utils.agentDisinfectionBarcodes.get(i)); } Utils.secondSupplyReBarcodes.addAll(tempBarcodes); - logger.info("保留4个包给二级供应室成功"); + logger.info("保留2个包给二级供应室成功"); Utils.retryingFindAndClick(By Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java =================================================================== diff -u -r26427 -r26575 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 26575) @@ -262,14 +262,14 @@ } click = new Actions(Utils.driver); if (Utils.isFind(Utils.retryingFind(By - .xpath("//span[contains(text(), '灭菌筐01')]")))) { + .xpath("//span[contains(text(), '灭菌筐03')]")))) { click.moveToElement( Utils.retryingFind(By - .xpath("//span[contains(text(), '灭菌筐01')]")), + .xpath("//span[contains(text(), '灭菌筐03')]")), 1, 1).perform(); click.doubleClick( Utils.retryingFind(By - .xpath("//span[contains(text(), '灭菌筐01')]"))) + .xpath("//span[contains(text(), '灭菌筐03')]"))) .perform(); JSWaiter.waitUntilJQueryReady(); if (Utils