Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java =================================================================== diff -u -r26431 -r26436 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 26431) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 26436) @@ -486,10 +486,14 @@ String name = Utils.settings.getJSONObject("临床科室").getString("名称"); openInvoiceWindow(name); - + //发货员 Utils.retryingFindAndSendKeys(By.id("senderBarcode"), Utils.settings.getJSONObject("一级供应室用户").getString("条码") + "\n"); + //核对员 + Utils.retryingFindAndSendKeys(By.id("assistantSenderBarcode"), + Utils.settings.getJSONObject("二级供应室用户").getString("条码") + + "\n"); for (int i = 0; i < Utils.oneSupplyReBarcodes.size(); i++) { int a = Integer.valueOf(Utils.oneSupplyReBarcodes.get(i)).intValue(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r26427 -r26436 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 26436) @@ -23,6 +23,8 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Wait; +import com.sun.media.jfxmedia.logging.Logger; + public class SterilizationTest { @Test @@ -62,7 +64,8 @@ .getString("条码"); String text = Utils.retryingFindAndGetText(By .id("sterilizationUser")); - String tempBarcode = null; + String tempBarcode1 = new String(); + String tempBarcode2 = new String(); /** * 扫描灭菌炉条码=》灭菌程序条码=》用户条码=》灭菌目的选择“器械包灭菌”=》篮筐或者器械包条码 @@ -87,8 +90,9 @@ .getString("条码"); //未入筐的器械包 List notEntryBasketTousseBarcods = SterilizationHelper.notEntryBasketTousseBarcods; - if (notEntryBasketTousseBarcods.size() > 0) { - tempBarcode = notEntryBasketTousseBarcods.get(1); + if (notEntryBasketTousseBarcods.size() > 1) { + tempBarcode1 = notEntryBasketTousseBarcods.get(0); + tempBarcode2 = notEntryBasketTousseBarcods.get(1); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), basketBarcode + "\n"); //未入筐的器械包有3个,先扫描条码让2个先入炉，剩下1个通过点击“一键入炉”入炉 @@ -97,7 +101,7 @@ notEntryBasketTousseBarcods.get(i) + "\n"); } } else { - System.out.print("无未入筐物品"); + System.out.print("入筐物品少于2个"); } // 一键入炉 Utils.retryingFindAndClick(By.id("btnBatchAddTousse")); @@ -149,18 +153,19 @@ .xpath("//div/div/div[contains(text(), '灭菌失败事件')]")); } } - if (notEntryBasketTousseBarcods.size() > 0) { + if (!StringUtils.isBlank(tempBarcode1)) { //扫描抽检器械包条码 Utils.retryingFindAndSendKeys(By.id("tempBarcode"), - notEntryBasketTousseBarcods.get(0) + "\n"); + tempBarcode1 + "\n"); //点击重新回收或重新装配选框 if(Utils.driver.findElement(By.id("recycle")).isEnabled()){ Utils.retryingFindAndClick(By.id("recycle")); }else{ Utils.retryingFindAndClick(By.id("repacking")); } //质量监测完该包变为“已废弃”状态，因此移除 - Utils.oneSupplyReBarcodes.remove(notEntryBasketTousseBarcods.get(0)); + Utils.oneSupplyReBarcodes.remove(tempBarcode1); + System.out.println("器械包"+tempBarcode1+"已废弃"); } else { //若无未入筐的器械包，则通过器械包名字选择器械包进行抽检 Utils.retryingFindAndClick(By.id("tousseName")); @@ -233,17 +238,18 @@ .xpath("//div/div/div[contains(text(), '灭菌失败事件')]")); } } - if (tempBarcode != null) { + if (!StringUtils.isBlank(tempBarcode2)) { Utils.retryingFindAndSendKeys(By.id("tempBarcode"), - tempBarcode + "\n"); + tempBarcode2 + "\n"); //点击重新回收或重新装配选框 if(Utils.driver.findElement(By.id("recycle")).isEnabled()){ Utils.retryingFindAndClick(By.id("recycle")); }else{ Utils.retryingFindAndClick(By.id("repacking")); } //质量监测完该包变为“已废弃”状态，因此移除 - Utils.oneSupplyReBarcodes.remove(tempBarcode); + Utils.oneSupplyReBarcodes.remove(tempBarcode2); + System.out.println("器械包"+tempBarcode2+"已废弃"); } else { Utils.retryingFindAndClick(By.id("tousseName")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java =================================================================== diff -u -r26427 -r26436 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java (.../Disinfection.java) (revision 26436) @@ -19,6 +19,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.openqa.selenium.Alert; import org.openqa.selenium.By; @@ -142,7 +143,7 @@ //选取篮筐中的前三个条码不为空的器械包移出篮筐 int i = 0; List tables = new ArrayList(); - while(i<3){ + while(i<6){ JSWaiter.waitUntilJSReady(); JSWaiter.waitUntilJQueryReady(); //器械包明细表 @@ -159,7 +160,7 @@ List tds = tr.findElements(By.tagName("td")); //条码在第二列 String barcodeText = tds.get(1).getText(); - if(barcodeText!=null&&(!barcodeText.equals(""))&&Integer.parseInt(barcodeText)%2!=0){ + if(!StringUtils.isBlank(barcodeText)){ JSWaiter.waitUntilJSReady(); JSWaiter.waitUntilJQueryReady(); //点击移除图标，移除图标在第五列 @@ -171,13 +172,13 @@ //把将要移出的条形码保存在未入筐条码集合中 SterilizationHelper.notEntryBasketTousseBarcods.add(barcodeText); logger.info("移除的条码为："+barcodeText); - i++; break; } } }else{ break; } + i++; } // String b = null; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java =================================================================== diff -u -r26427 -r26436 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 26427) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java (.../Assemble.java) (revision 26436) @@ -308,23 +308,23 @@ public void assemble_CustomSet() { try { Utils.driver.switchTo().defaultContent(); - String name = Utils.settings.getJSONObject("一级供应室自定义器械包") - .getString("名称") + "\n"; +// String name = Utils.settings.getJSONObject("一级供应室自定义器械包") +// .getString("名称") + "\n"; Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); - + assemble_success1(); // 编辑装配的物品的数量 // Actions action = new Actions(Utils.driver); - for (int i = 0; i < 1; i++) { - editTreeGridCell("waitPackingTreeGrid", i, 0); - WebElement a = Utils.retryingFind(By - .xpath("//span[contains(text(), '" + name + "')]")); - if (Utils.isFind(a)) { - assemble_success1(); - continue; - } else { - break; - } - } +// for (int i = 0; i < 1; i++) { +// editTreeGridCell("waitPackingTreeGrid", i, 0); +// WebElement a = Utils.retryingFind(By +// .xpath("//*[contains(text(), '" + name + "')]")); +// if (Utils.isFind(a)) { +// assemble_success1(); +// continue; +// } else { +// break; +// } +// } JSWaiter.waitUntilJQueryReady(); } catch (Exception e) { e.printStackTrace(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r26431 -r26436 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26431) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 26436) @@ -153,6 +153,8 @@ public void all() { try { + final String SERVER_URL = Utils.settings.get("服务器地址").toString(); + /** * 初始化系统数据：先将系统中的业务数据清除，然后插入系统的基础数据 */ @@ -181,112 +183,111 @@ /********************************* * 回收清点 *********************************/ - logger.info("回收开始:"); - Utils.DateTime(); - - final String SERVER_URL = Utils.settings.get("服务器地址").toString(); - Utils.driver.get(SERVER_URL + "/?logonType=1080p"); - login.login_secondSupplyRoom(false); - - /** 二级供应室回收 */ - /** 二级供应室快速入筐回收 */ - recyle.recyle_quickly(); - Utils.waitUntilUrlContains( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - - /** 二级供应室自定义入筐回收 **/ - recyle.recyle_custom(); - logger.info("二级供应室自定义入筐回收完成"); - Utils.waitUntilUrlContains( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - - /** 二级供应室判断消毒物品申请单是否存在 */ - Utils.retryingFind(By.tagName("body")); - WebElement element = Utils.retryingFindForthCellOfTable(By - .id("awaitForRecycleTable")); - if (Utils.isFind(element)) { - recyle.recyle_SecondSupplyRoom(); - Utils.waitUntilUrlContains( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - logger.info("二级供应室消毒物品申请单回收完成"); - Utils.retryingFindAndClick(By.id("return")); - Utils.waitUntilUrlChange(SERVER_URL - + "/homepage/portalPage.jsp", 8); - Utils.tryToCloseWarningWindow(); - } else { - Utils.waitUntilUrlContains( - SERVER_URL - + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", - 8); - Utils.retryingFindAndClick(By.id("return")); - Utils.waitUntilUrlChange(SERVER_URL - + "/homepage/portalPage.jsp", 8); - Utils.tryToCloseWarningWindow(); - } - - - /** 二级供应室清洗成功 */ - wash.wash_secondSupplyRoom(); - logger.info("二级供应室清洗成功"); - Utils.refresh(); - Utils.retryingFindAndHover(By.id("packing")); - Utils.retryingFindAndClick(By.linkText(Utils.settings - .getJSONObject("二级供应室装配组").getString("名称1"))); - - /** 二级供应室装配 */ - assemble.assemble_secondSupplyRoomSet(); - assemble.assemble_secondSupplyRoom_QualityMonitoring(); - assemble.assemble_secondSupplyRoom_Print_Recyle_List(); - logger.info("二级供应室装配完成"); - login.login_Out(); - - /** 二级供应室装配后,一级供应室做代理灭菌 */ - login.login_oneSupplyRoom(); - disinfection.disinfection_agent(); - logger.info("二级供应室装配后做代理灭菌完成"); - login.login_Out(); - - /** 二级供应室装配敷料 */ - login.login_secondSupplyRoom(); - assemble.assemble_secondSupplyRoomdressing(); - logger.info("二级供应室装配敷料完成"); - - /** 二级供应室审核**/ - Utils.driver.switchTo().defaultContent(); - Utils.retryingFindAndClick(By - .xpath("//span[contains(text(), '个人桌面')]")); - Utils.retryingFindAndHover(By.id("reviewPacking")); - Utils.retryingFindAndClick(By.linkText(Utils.settings - .getJSONObject("二级供应室装配组").getString("名称1"))); - Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); - element = Utils.retryingFind(By - .xpath("//button[contains(text(), '进入审核列表')]")); - String basket = Utils.settings.getJSONObject("灭菌篮筐001").getString( - "条码"); - handleReview(element, review, basket,"second"); - logger.info("二级供应室审核完成"); - - /** 二级供应室灭菌 */ - disinfection.disinfection_secondSupplyRoom(); - logger.info("二级供应室灭菌完成"); - - /** 发货 */ - Utils.refresh(); - Utils.retryingFindAndClick(By.id("invoicePlan")); - Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); - String name = Utils.settings.getJSONObject("临床科室").getString("名称"); - delivery.openInvoiceWindow(name); - delivery.Delivery_secondSupplyRoom(); - - /** 二级供应室录入使用记录 */ - userrecord.UserRecord_success(); - login.login_Out(); +// logger.info("回收开始:"); +// Utils.DateTime(); +// +// Utils.driver.get(SERVER_URL + "/?logonType=1080p"); +// login.login_secondSupplyRoom(false); +// +// /** 二级供应室回收 */ +// /** 二级供应室快速入筐回收 */ +// recyle.recyle_quickly(); +// Utils.waitUntilUrlContains( +// SERVER_URL +// + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", +// 8); +// +// /** 二级供应室自定义入筐回收 **/ +// recyle.recyle_custom(); +// logger.info("二级供应室自定义入筐回收完成"); +// Utils.waitUntilUrlContains( +// SERVER_URL +// + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", +// 8); +// +// /** 二级供应室判断消毒物品申请单是否存在 */ +// Utils.retryingFind(By.tagName("body")); +// WebElement element = Utils.retryingFindForthCellOfTable(By +// .id("awaitForRecycleTable")); +// if (Utils.isFind(element)) { +// recyle.recyle_SecondSupplyRoom(); +// Utils.waitUntilUrlContains( +// SERVER_URL +// + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", +// 8); +// logger.info("二级供应室消毒物品申请单回收完成"); +// Utils.retryingFindAndClick(By.id("return")); +// Utils.waitUntilUrlChange(SERVER_URL +// + "/homepage/portalPage.jsp", 8); +// Utils.tryToCloseWarningWindow(); +// } else { +// Utils.waitUntilUrlContains( +// SERVER_URL +// + "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980", +// 8); +// Utils.retryingFindAndClick(By.id("return")); +// Utils.waitUntilUrlChange(SERVER_URL +// + "/homepage/portalPage.jsp", 8); +// Utils.tryToCloseWarningWindow(); +// } +// +// +// /** 二级供应室清洗成功 */ +// wash.wash_secondSupplyRoom(); +// logger.info("二级供应室清洗成功"); +// Utils.refresh(); +// Utils.retryingFindAndHover(By.id("packing")); +// Utils.retryingFindAndClick(By.linkText(Utils.settings +// .getJSONObject("二级供应室装配组").getString("名称1"))); +// +// /** 二级供应室装配 */ +// assemble.assemble_secondSupplyRoomSet(); +// assemble.assemble_secondSupplyRoom_QualityMonitoring(); +// assemble.assemble_secondSupplyRoom_Print_Recyle_List(); +// logger.info("二级供应室装配完成"); +// login.login_Out(); +// +// /** 二级供应室装配后,一级供应室做代理灭菌 */ +// login.login_oneSupplyRoom(); +// disinfection.disinfection_agent(); +// logger.info("二级供应室装配后做代理灭菌完成"); +// login.login_Out(); +// +// /** 二级供应室装配敷料 */ +// login.login_secondSupplyRoom(); +// assemble.assemble_secondSupplyRoomdressing(); +// logger.info("二级供应室装配敷料完成"); +// +// /** 二级供应室审核**/ +// Utils.driver.switchTo().defaultContent(); +// Utils.retryingFindAndClick(By +// .xpath("//span[contains(text(), '个人桌面')]")); +// Utils.retryingFindAndHover(By.id("reviewPacking")); +// Utils.retryingFindAndClick(By.linkText(Utils.settings +// .getJSONObject("二级供应室装配组").getString("名称1"))); +// Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); +// element = Utils.retryingFind(By +// .xpath("//button[contains(text(), '进入审核列表')]")); +// String basket = Utils.settings.getJSONObject("灭菌篮筐001").getString( +// "条码"); +// handleReview(element, review, basket,"second"); +// logger.info("二级供应室审核完成"); +// +// /** 二级供应室灭菌 */ +// disinfection.disinfection_secondSupplyRoom(); +// logger.info("二级供应室灭菌完成"); +// +// /** 发货 */ +// Utils.refresh(); +// Utils.retryingFindAndClick(By.id("invoicePlan")); +// Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); +// String name = Utils.settings.getJSONObject("临床科室").getString("名称"); +// delivery.openInvoiceWindow(name); +// delivery.Delivery_secondSupplyRoom(); +// +// /** 二级供应室录入使用记录 */ +// userrecord.UserRecord_success(); +// login.login_Out(); Utils.driver.get(Utils.settings.get("服务器地址").toString() + "/?logonType=1080p"); login.loginAction(); @@ -365,7 +366,7 @@ Utils.retryingFindAndClick(By.id("appTypeSelect")); Utils.retryingFindAndClick(By .cssSelector("option[value='自定义器械包申请单']")); - element = Utils.retryingFindForthCellOfTable(By + WebElement element = Utils.retryingFindForthCellOfTable(By .id("awaitForRecycleTable")); if (Utils.isFind(element)) { recyle.recyle_customSet(); @@ -465,7 +466,7 @@ /*** 一级供应室审核外来器械 ***/ element = Utils.retryingFind(By .xpath("//button[contains(text(), '进入审核列表')]")); - basket = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); + String basket = Utils.settings.getJSONObject("灭菌篮筐01").getString("条码"); handleReview(element, review, basket,"one"); logger.info("一级供应室审核外来器械完成"); review.Review_afterDelete(); @@ -506,6 +507,13 @@ logger.info("一级供应室补充标示牌并装配完成"); assemble.assemble_dressing(); logger.info("一级供应室装配敷料完成"); + + /** 自定义器械包属于常规组，点击常规组装配 */ + Utils.refresh(); + Utils.retryingFindAndHover(By.id("packing")); + Utils.retryingFindAndClick(By.linkText(Utils.settings + .getJSONObject("一级供应室装配组").getString("名称1"))); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); assemble.assemble_CustomSet(); logger.info("一级供应室装配自定义器械完成"); @@ -578,6 +586,8 @@ + "/?logonType=1080p"); login.loginAction(); Utils.waitUntilUrlContains("awaitForRecycleList.jsp", 15); + Utils.retryingFindAndClick(By + .cssSelector("option[value='类型']")); Utils.retryingFindAndClick(By.linkText("申请时间")); recyle.recyle_Monitor(); JSWaiter.waitUntilJQueryReady(); @@ -703,6 +713,7 @@ Utils.refresh(); delivery.Delivery_rejectsendout(); logger.info("供应室退货后发货完成"); + /*** 供应室一次性物品退库 ***/ logger.info("一次性物品退库开始:"); Utils.refresh();