Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
===================================================================
diff -u -r30063 -r30066
--- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 30063)
+++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 30066)
@@ -122,7 +122,7 @@
 	var materialStore = new Ext.data.Store({
         pageSize: 100,
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDataForReturnMaterial.do',
+			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDataForReturnMaterialByDepart.do',
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
@@ -138,6 +138,7 @@
 		listeners : {
 			beforeload : function(store,option) {
 				store.baseParams['departCoding'] = getCurrentDepartCoding();
+				store.baseParams['settleAccountsDepartCoding'] = getSettleAccountsDepartCoding();
 			}
 		}
 	});
@@ -686,12 +687,26 @@
 												showResult('请先选择仓库!');
 												return ;
 											}
+											/*
+											Ext.Ajax.request({
+												url: WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDataForReturnMaterialByDepart.do',
+												params: {
+													departCoding: getCurrentDepartCoding(),
+													settleAccountsDepartCoding:getSettleAccountsDepartCoding()
+												},
+												success: function (response, options) {
+													var result = Ext.decode(response.responseText);
+													if(result != null){
+														setPrices(result);
+													}
+												}
+											});*/
 											ReturnMaterialRecordTableManager.loadMaterialPriceAmountInfoCanReturned(
-												getCurrentDepartCoding(),record.data.id,warehouseId,function(priceAmountList){
+												getCurrentDepartCoding(),getSettleAccountsDepartCoding(),record.data.id,warehouseId,function(priceAmountList){
 														if(priceAmountList != null){
 															setPrices(priceAmountList);
 														}
-													});
+													})
 											top.Ext.getCmp('package1').setValue(record.data.name);
 											top.Ext.getCmp('selectedMaterialDefId').setValue(record.data.id);
 										},