Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js =================================================================== diff -u -r14590 -r14593 --- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js (.../returnMaterialRecordView.js) (revision 14590) +++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js (.../returnMaterialRecordView.js) (revision 14593) @@ -222,9 +222,10 @@ valueField : 'id', displayField : 'displayName', width : 600, + store : new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true', + url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDataForReturnMaterial.do', method : 'POST' }), reader : new Ext.data.JsonReader({ Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java =================================================================== diff -u -r14590 -r14593 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java (.../ReturnMaterialRecordTableManager.java) (revision 14590) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java (.../ReturnMaterialRecordTableManager.java) (revision 14593) @@ -55,7 +55,7 @@ + ReturnMaterialItem.class.getName() + " rmi inner join " + MaterialDefinition.class.getSimpleName() + " md on md.id=rmi.materialDefinitionId where md.name = '" - + keyWord + "' and dg.specification='" + specification + + keyWord + "' and md.specification='" + specification + "')"; } else { sql += " and (po.id in (select rmi.returnMaterialRecord.id from " Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js =================================================================== diff -u -r14592 -r14593 --- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js (.../returnMaterialRecordForm.js) (revision 14592) +++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js (.../returnMaterialRecordForm.js) (revision 14593) @@ -602,7 +602,7 @@ minChars : 0, valueField : 'id', displayField : 'displayName', - width : 200, + width : 250, store : materialStore, forceSelection : true, lazyInit : true,