Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
===================================================================
diff -u -r34196 -r34204
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 34196)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 34204)
@@ -795,25 +795,18 @@
 						top.Ext.getCmp('disposableGoodsBatchID').setValue(record.data.disposableGoodsBatchID);
 						top.Ext.getCmp('diposableGoodsStockId').setValue(record.data.id);
 						top.Ext.getCmp('diposableGoodsStorage').setValue(record.data.storage);
-						top.Ext.getCmp('diposableGoodsCost').setValue(record.data.price);
+						top.Ext.getCmp('diposableGoodsCost').setValue(record.data.cost);
 						top.Ext.getCmp('diposableGoodsExpDate').setValue(dateObj2String(record.data.expDate));
 						top.Ext.getCmp('diposableGoodsSupplierName').setValue(record.data.supplierName);
 						combo.setValue(record.data.batchNumber);  //（陈家儒改）
 						// 清空价格
 						clearPrice();
-						// 填充价格
-						var batch = getSelectedBatch();
-						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
-							//如果所选批次号的库存为0,给予"不能领用"的提示
-							if(priceAmounts.length == 0){
-								showResult("批次号为" + record.data.batchNumber + "的一次性物品库存为0,不能领用!");
-							}else{
-								if(priceAmounts && priceAmounts.length > 0){
-									setCmpValue('combo_price',priceAmounts[0].price);
-									setCmpValue('combo_amount',priceAmounts[0].amount);
-								}
-							}
-						});
+						if(record.data.storage == 0){
+							showResult("批次号为" + record.data.batchNumber + "的一次性物品库存为0,不能领用!");
+						}else{
+							setCmpValue('combo_price',record.data.cost);
+							setCmpValue('combo_amount',record.data.storage);
+						}
 					},
 					specialkey : function(field, e) {
 						if (e.getKey() == Ext.EventObject.ENTER) {