Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java =================================================================== diff -u -r17933 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 17933) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 18142) @@ -1,6 +1,9 @@ package test_4_1.sterilization.service.impl; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.List; import net.sf.json.JSONObject; @@ -44,21 +47,18 @@ Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); - String tempBarcode = ""; - if (barcodes != null && !barcodes.equals("")) { - String[] barcodesArr = barcodes.split(";"); - tempBarcode = barcodesArr[0]; - for (String barcode : barcodesArr) { - Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, barcode + "\n"); - } -// Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, barcodesArr[0]); -// Utils.retryingFindAndDoAction(By.id("inputBarcodeEnd"), Utils.ACTION_SENDKEYS, barcodesArr[1] + "\n"); - + + //扫描物品或者审核篮筐 + String basketBarcode = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); + List notEntryBasketTousseBarcods = SterilizationHelper.notEntryBasketTousseBarcods; + String tempBarcode = notEntryBasketTousseBarcods.get(0); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, basketBarcode + "\n"); + for (int i = 0; i < 3; i ++) { + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, notEntryBasketTousseBarcods.get(i) + "\n"); } -// Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 - //保存灭菌记录 Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); SterilizationHelper.炉次_1号高温蒸汽灭菌炉 ++; @@ -123,11 +123,18 @@ javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');"; javaScript += "Ext.getCmp('biologyResult').setValue('合格');"; Utils.runJavaScript(javaScript); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); + Utils.driver.quit(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -236,8 +243,14 @@ javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');"; javaScript += "Ext.getCmp('biologyResult').setValue('合格');"; Utils.runJavaScript(javaScript); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/helper/SterilizationHelper.java =================================================================== diff -u -r17932 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/helper/SterilizationHelper.java (.../SterilizationHelper.java) (revision 17932) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/helper/SterilizationHelper.java (.../SterilizationHelper.java) (revision 18142) @@ -1,5 +1,8 @@ package test_4_1.sterilization.helper; +import java.util.LinkedList; +import java.util.List; + /** * 自动化测试-灭菌模块的辅助类 * @author Chenjiaru @@ -15,4 +18,9 @@ */ public static int 炉次_6号高温蒸汽灭菌炉 = 0; + /** + * 没有进入审核篮筐的条码集合 + */ + public static List notEntryBasketTousseBarcods = new LinkedList(); + } Index: ssts-selenium-test/src/test/java/test_4_1/ALL.java =================================================================== diff -u -r18131 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/ALL.java (.../ALL.java) (revision 18131) +++ ssts-selenium-test/src/test/java/test_4_1/ALL.java (.../ALL.java) (revision 18142) @@ -10,6 +10,7 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; import test_4_1.apply.applyConstants.DeskIconEnum; import test_4_1.apply.chain.ChainConsumer; +import test_4_1.sterilization.SterilizationTest; import test_4_1.tools.LoginUtil; import test_4_1.tools.Utils; @@ -311,26 +312,29 @@ handleReview(element, review); /*** 一级供应室灭菌装载删除 ***/ disinfection.disinfection_loading(); - /*** 一级供应室灭菌 ***/ - System.out.print("灭菌开始:"); - Utils.DateTime(); - Utils.driver.switchTo().defaultContent(); - Utils.retryingFindAndClick(By - .xpath("//span[contains(text(), '个人桌面')]")); - moveover = new Actions(Utils.driver); - moveover.moveToElement( - Utils.retryingFind(By.id("sterilizationRecord"))).perform(); - Utils.retryingFindAndClick(By.linkText(Utils.settings - .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); - Utils.retryingFindAndSwitchToFrame(By - .id("iframe_sterilizationRecord")); - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '添加')]")); - Utils.driver.switchTo().defaultContent(); - currentwindowhandle = Utils.driver.getWindowHandle(); - Utils.driver.switchTo().window(currentwindowhandle); - disinfection.disinfection_failAndSuccess(); - disinfection.after(); + + //一级供应室灭菌 + SterilizationTest.sterilizationSeriesOperationsOfFristSupplyRoom(); + +// System.out.print("灭菌开始:"); +// Utils.DateTime(); +// Utils.driver.switchTo().defaultContent(); +// Utils.retryingFindAndClick(By +// .xpath("//span[contains(text(), '个人桌面')]")); +// moveover = new Actions(Utils.driver); +// moveover.moveToElement( +// Utils.retryingFind(By.id("sterilizationRecord"))).perform(); +// Utils.retryingFindAndClick(By.linkText(Utils.settings +// .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); +// Utils.retryingFindAndSwitchToFrame(By +// .id("iframe_sterilizationRecord")); +// Utils.retryingFindAndClick(By +// .xpath("//button[contains(text(), '添加')]")); +// Utils.driver.switchTo().defaultContent(); +// currentwindowhandle = Utils.driver.getWindowHandle(); +// Utils.driver.switchTo().window(currentwindowhandle); +// disinfection.disinfection_failAndSuccess(); +// disinfection.after(); /*** 一级供应室一次性物品 ***/ System.out.print("一次性物品开始:"); Utils.DateTime(); Index: ssts-selenium-test/src/test/java/test_4_1/Disinfection.java =================================================================== diff -u -r18038 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/Disinfection.java (.../Disinfection.java) (revision 18038) +++ ssts-selenium-test/src/test/java/test_4_1/Disinfection.java (.../Disinfection.java) (revision 18142) @@ -30,6 +30,7 @@ import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; +import test_4_1.sterilization.helper.SterilizationHelper; import test_4_1.tools.Utils; /** @@ -131,6 +132,7 @@ int a = Integer.valueOf(b).intValue(); if (a % 2 != 0) { row.findElement(By.tagName("img")).click(); + SterilizationHelper.notEntryBasketTousseBarcods.add("0" + a); Utils.doWait(800); break; } Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java =================================================================== diff -u -r17933 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 17933) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 18142) @@ -1,6 +1,9 @@ package test_4_1.sterilization.service.impl; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; @@ -71,16 +74,19 @@ // Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); //中大附一，灭菌员是自动填的 Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); - String tempBarcode = ""; - if (barcodes != null && !barcodes.equals("")) { - String[] barcodesArr = barcodes.split(";"); - tempBarcode = barcodesArr[0]; - for (String barcode : barcodesArr) { - Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, barcode + "\n"); - } - } //扫描单个条码的 -// Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + + //扫描物品或者审核篮筐 + String basketBarcode = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); + List notEntryBasketTousseBarcods = SterilizationHelper.notEntryBasketTousseBarcods; + String tempBarcode = notEntryBasketTousseBarcods.get(0); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, basketBarcode + "\n"); + for (int i = 0; i < 3; i ++) { + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, notEntryBasketTousseBarcods.get(i) + "\n"); + } + Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + + //保存灭菌记录 Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); SterilizationHelper.炉次_1号高温蒸汽灭菌炉 ++; @@ -175,8 +181,13 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); @@ -314,8 +325,13 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java =================================================================== diff -u -r17933 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 17933) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 18142) @@ -1,6 +1,9 @@ package test_4_1.sterilization.service.impl; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; @@ -71,16 +74,17 @@ // Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); //中大附一，灭菌员是自动填的 Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); - String tempBarcode = ""; - if (barcodes != null && !barcodes.equals("")) { - String[] barcodesArr = barcodes.split(";"); - tempBarcode = barcodesArr[0]; - for (String barcode : barcodesArr) { - Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, barcode + "\n"); - } - } //扫描单个条码的 -// Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + //扫描物品或者审核篮筐 + String basketBarcode = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); + List notEntryBasketTousseBarcods = SterilizationHelper.notEntryBasketTousseBarcods; + String tempBarcode = notEntryBasketTousseBarcods.get(0); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, basketBarcode + "\n"); + for (int i = 0; i < 3; i ++) { + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, notEntryBasketTousseBarcods.get(i) + "\n"); + } + Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + //保存灭菌记录 Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); SterilizationHelper.炉次_1号高温蒸汽灭菌炉 ++; @@ -175,8 +179,13 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); @@ -314,8 +323,13 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java =================================================================== diff -u -r17882 -r18142 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 17882) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18142) @@ -1,27 +1,137 @@ package test_4_1.sterilization; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; -import test_4_1.Login; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.List; + +import net.sf.json.JSONObject; + +import org.testng.AssertJUnit; + +import test_4_1.sterilization.helper.SterilizationHelper; import test_4_1.tools.Utils; +import org.openqa.selenium.By; +import org.openqa.selenium.Keys; +import org.openqa.selenium.interactions.Actions; public class SterilizationTest { - - @Test - public void reateSterilizationRecordTest() { - + + public static void sterilizationSeriesOperationsOfFristSupplyRoom() { + try { + Utils.driver.switchTo().defaultContent(); + Utils.retryingFindAndDoAction(By.xpath("//span[contains(text(), '个人桌面')]"), Utils.ACTION_CLICK); + Actions moveover = new Actions(Utils.driver); + moveover.moveToElement(Utils.retryingFind(By.id("sterilizationRecord"))).perform(); + Utils.retryingFindAndDoAction(By.linkText(Utils.settings.getJSONObject("灭菌炉分组").getString("大型压力蒸汽")), Utils.ACTION_CLICK); + + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id("addBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().defaultContent(); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + + JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + String sterilizerName = sterilizerObj.getString("名称"); + String sterilizerBarcode = sterilizerObj.getString("条码"); + String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); + String cssduser1Barcode = Utils.settings.getJSONObject("一级供应室用户").getString("条码"); + //扫描灭菌炉条码=》灭菌程序条码=》用户条码=》灭菌目的选择“器械包灭菌”=》篮筐或者器械包条码 + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, sterilizerBarcode + "\n"); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); + Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); + Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); + + //扫描物品或者审核篮筐 + String basketBarcode = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); + List notEntryBasketTousseBarcods = SterilizationHelper.notEntryBasketTousseBarcods; + String tempBarcode = notEntryBasketTousseBarcods.get(0); + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, basketBarcode + "\n"); + for (int i = 0; i < 3; i ++) { + Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, notEntryBasketTousseBarcods.get(i) + "\n"); + } + Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), Utils.ACTION_CLICK); //一键入炉 + + + //保存灭菌记录 + Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 ++; + + //灭菌中断 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.id("sterilizationInterruptBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '是')]"), Utils.ACTION_CLICK); + + //灭菌中断后添加质量监测 + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.id("formName"), Utils.ACTION_SENDKEYS, Keys.DOWN); + Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '无')]"), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '保存')]"), Utils.ACTION_CLICK); + + //继续灭菌 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-interruptionHandle"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.id("continueBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '是')]"), Utils.ACTION_CLICK); + + //灭菌失败 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.id("sterilizationFailureBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '是')]"), Utils.ACTION_CLICK); + + //灭菌失败后添加质量监测 + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.id("formName"), Utils.ACTION_SENDKEYS, Keys.DOWN); + Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '灭菌失败事件')]"), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.id("tempBarcode"), Utils.ACTION_SENDKEYS, tempBarcode + "\n"); + Utils.retryingFindAndDoAction(By.id("repacking"), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '保存')]"), Utils.ACTION_CLICK); + + //重新灭菌 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 + "-failureHandle"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.xpath("//button[contains(text(), '重新灭菌')]"), Utils.ACTION_CLICK); //他的id是saveBtn + SterilizationHelper.炉次_1号高温蒸汽灭菌炉 ++; + + //完成灭菌 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.id("completeSterilizationBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + Utils.retryingFindAndDoAction(By.id("completeUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); + Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); + + //填写质量监测 + Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + Utils.retryingFindAndDoAction(By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉), Utils.ACTION_CLICK); + Utils.retryingFindAndDoAction(By.id("modifyBtn"), Utils.ACTION_CLICK); + Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); + String javaScript = "Ext.getCmp('physicsResult').setValue('合格');"; + javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');"; + javaScript += "Ext.getCmp('biologyResult').setValue('合格');"; + Utils.runJavaScript(javaScript); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, 30); + + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + calendar.add(Calendar.MINUTE, 30); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, sdf.format(calendar.getTime())); + Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); + Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); + Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); + Utils.driver.quit(); + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } } - @BeforeClass - public void logon() { - Utils.init(); - Login login = new Login(); - login.login_oneSupplyRoom(); - } - @AfterClass - public void logoff() { - Utils.driver.quit(); - } - }