Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json =================================================================== diff -u -r33956 -r33984 --- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 33956) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 33984) @@ -162,8 +162,8 @@ }, "task_group":"术科组", "delivery_barcodes":[ - {"barcode":"010015047"}, - {"barcode":"010015048"} + {"barcode":"010014002"}, + {"barcode":"010014003"} ], "expect":"保存成功" }, Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java =================================================================== diff -u -r33956 -r33984 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java (.../TestMainProcess.java) (revision 33956) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java (.../TestMainProcess.java) (revision 33984) @@ -57,8 +57,8 @@ private UseRecordProxy useRecordProxy = new UseRecordProxy(); private static JSONObject nomalTousseProcessJsonObj;//普通器械包闭环流程用例参数 private static JSONObject traceDisinfetionProcessJsonObj;//追溯的消毒物品闭环流程用例参数 - private static JSONObject notTracetraceDisinfetionProcessJsonObj;//不追溯的消毒物品闭环流程用例参数 - private static JSONObject disposableGoodProcessJsonObj;//一次性物品闭环流程用例参数 + private static JSONObject notTracetraceDisinfetionProcessJsonObj;//不追溯的消毒物品申领发货流程用例参数 + private static JSONObject disposableGoodProcessJsonObj;//一次性物品申领发货流程用例参数 @BeforeClass public static void setUp_class(){ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java =================================================================== diff -u -r33945 -r33984 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java (.../PersonalDesktopProxy.java) (revision 33945) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java (.../PersonalDesktopProxy.java) (revision 33984) @@ -35,6 +35,7 @@ */ @Step("点击跳转到科室申领标签页") public void go_apply(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_apply_icon(); personalDesktopHandle.switch_to_apply_frame(); } @@ -44,6 +45,7 @@ */ @Step("点击跳转到回收清点窗口") public void go_recycle(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_recycle_icon(); Utils.switchBetweenTwoWins(); Utils.driver.manage().window().maximize(); @@ -54,6 +56,7 @@ */ @Step("点击跳转到清洗消毒标签页") public void go_wash(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_wash_icon(); personalDesktopHandle.switch_to_wash_frame(); } @@ -64,6 +67,7 @@ */ @Step("点击跳转到装配管理标签页") public void go_pack(String taskGroup){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.hover_on_pack_icon(); personalDesktopHandle.click_tack_group(taskGroup); personalDesktopHandle.switch_to_pack_frame(); @@ -75,6 +79,7 @@ */ @Step("点击跳转到审核打包标签页") public void go_review(String taskGroup){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.hover_on_review_icon(); personalDesktopHandle.click_tack_group(taskGroup); personalDesktopHandle.switch_to_review_frame(); @@ -86,6 +91,7 @@ */ @Step("点击跳转到灭菌管理标签页") public void go_sterilization(String sterilizationGroup){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.hover_on_sterilization_icon(); personalDesktopHandle.click_sterilization_group(sterilizationGroup); personalDesktopHandle.switch_to_sterilization_frame(); @@ -96,6 +102,7 @@ */ @Step("点击跳转到发货计划标签页") public void go_invoice_plan(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_invoice_plan_icon(); personalDesktopHandle.switch_to_invoice_plan_frame(); } @@ -105,6 +112,7 @@ */ @Step("点击跳转到物品签收标签页") public void go_sign(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_sign_icon(); personalDesktopHandle.switch_to_sign_frame(); } @@ -114,6 +122,7 @@ */ @Step("点击跳转到使用记录标签页") public void go_use_record(){ + personalDesktopHandle.click_warning_win_close_btns(); personalDesktopHandle.click_use_record_icon(); personalDesktopHandle.switch_to_use_record_frame(); }