Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
===================================================================
diff -u -r12777 -r12780
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 12777)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 12780)
@@ -136,11 +136,10 @@
 		return 0.00;
 	}
 	// 根据一次性物品和批次加载可退货的价格列表
-	public List<ReturnGoodsItemVO.PriceAmount> loadDiposableGoodsPriceAmountInfoCanReturned(String diposableGoodsID,String depart,String diposableName,String batchNumber){
+	public List<ReturnGoodsItemVO.PriceAmount> loadDiposableGoodsPriceAmountInfoCanReturned(String depart,String disposableGoodsBatchStockID){
 		// 价格列表
 		List<ReturnGoodsItemVO.PriceAmount> priceAmountList = returnGoodsRecordManager
-				.loadDiposableGoodsPriceAmountInfoCanReturned(diposableGoodsID,depart, "",
-						diposableName, null, batchNumber);
+				.loadDiposableGoodsPriceAmountInfoCanReturned(depart,disposableGoodsBatchStockID);
 		return priceAmountList;
 	}
 
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r12775 -r12780
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 12775)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 12780)
@@ -419,8 +419,7 @@
 		diposableGood.put("storage", storage);
 		// 价格列表
 		List<ReturnGoodsItemVO.PriceAmount> priceAmountList = returnGoodsRecordManager
-				.loadDiposableGoodsPriceAmountInfoCanReturned(warehouseID,depart, "",
-						showName, barcode, batchNumber);
+				.loadDiposableGoodsPriceAmountInfoCanReturned(depart,disposableGoodsBatchStock.getId().toString());
 		diposableGood.put("priceAmountList", priceAmountList);
 		return diposableGood;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r12777 -r12780
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 12777)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 12780)
@@ -990,7 +990,7 @@
 												var showName = top.Ext.getCmp('package1').getValue();
 												var disposableGoodsBatchStockID = record.data.disposableGoodsBatchStockID;
 												curBatch = record.data;
-												ReturnGoodsRecordTableManager.loadDiposableGoodsPriceAmountInfoCanReturned(disposableGoodsBatchStockID,depart,showName,batchNumber,function(priceAmountList){
+												ReturnGoodsRecordTableManager.loadDiposableGoodsPriceAmountInfoCanReturned(depart,disposableGoodsBatchStockID,function(priceAmountList){
 													if(priceAmountList != null){
 														setPrices(priceAmountList);
 													}