Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r18491 -r18648 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 18648) @@ -655,6 +655,10 @@ name : 'orgWashEndTime', id : 'orgWashEndTime' },{ + id:'washLoadResult', + xtype:'hidden', + value:"0" + },{ id : 'serialNum', columnWidth : 0.5, layout : 'form', @@ -1162,6 +1166,7 @@ clearInterval(startDateTimerHandle); clearInterval(endDateTimerHandle); }); + top.Ext.getCmp('washLoadResult').setValue("0"); formObj.form.load({ url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!loadWashAndDisinfectRecord.do', method : 'GET', @@ -1230,8 +1235,10 @@ top.Ext.getCmp('cleanParameter').setValue(result); } }); + top.Ext.getCmp('washLoadResult').setValue("1"); }, failure : function(form, action) { + top.Ext.getCmp('washLoadResult').setValue("-1"); showResult("加载失败,请联系管理员!"); }, params : { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java =================================================================== diff -u -r18392 -r18648 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 18392) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 18648) @@ -457,7 +457,11 @@ Utils.driver.switchTo().defaultContent(); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - + + wait.until(ExpectedConditions.attributeToBe( + Utils.driver.findElement(By.id("washLoadResult")), + "value", "1")); + Utils.retryingFindAndSendKeys(By.id("inputText"), Utils.settings .getJSONObject("二级供应室清洗机").getString("清洗机条码") + "\n"); wait.until(ExpectedConditions.attributeToBeNotEmpty(