Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js =================================================================== diff -u -r40632 -r40812 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 40632) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 40812) @@ -804,7 +804,7 @@ beforeselect: function (combo, record, index) { if (record.data.name != combo.getValue()) { if (top.Ext.getCmp('barcode2').getValue()) { - getTousseInstanceNameAndResponsiblePerson(top.Ext.getCmp('tempBarcode2').getValue(), combo.getValue(), null, true, false); + getTousseInstanceNameAndResponsiblePerson2(top.Ext.getCmp('tempBarcode2').getValue(), combo.getValue(), null, true, false); } } }, @@ -842,7 +842,7 @@ listeners: { specialkey: function (field, e) { if (e.getKey() == 13) { - getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId2').getValue(), materialDefinitionStore, true, true); + getTousseInstanceNameAndResponsiblePerson2(field.getValue(), top.Ext.getCmp('formDefinitionId2').getValue(), materialDefinitionStore, true, true); field.setValue(''); } } @@ -1675,7 +1675,7 @@ listeners: { specialkey: function (field, e) { if (e.getKey() == 13) { - getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId').getValue(), materialDefinitionStore, false, true); + getTousseInstanceNameAndResponsiblePerson2(field.getValue(), top.Ext.getCmp('formDefinitionId').getValue(), materialDefinitionStore, false, true); field.setValue(''); } } @@ -2210,7 +2210,7 @@ } } -function getTousseInstanceNameAndResponsiblePerson(tempBarcode, qmDefinitionId, materialDefinitionStore, isQMView, isScan) { +function getTousseInstanceNameAndResponsiblePerson2(tempBarcode, qmDefinitionId, materialDefinitionStore, isQMView, isScan) { if (tempBarcode) { Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/qualityMonitoringDefinitionAction!getTousseInstanceNameAndResponsiblePerson.do',