Index: ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
===================================================================
diff -u -r12874 -r12877
--- ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12874)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12877)
@@ -73,12 +73,14 @@
 
 function loadBatchDiposableGoodsByBarcode(){
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	var warehouseId = top.Ext.getCmp('wareHouseId').getValue();
 	top.Ext.getCmp('barcode').setValue('');
 	
 	Ext.Ajax.request({
 		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodBatchStockByBarcode.do',
 		params : {
-			barcode : barcode
+			barcode : barcode,
+			warehouseId : warehouseId
 		},
 		success : function(response, options) {
 			var result = response.responseText;
@@ -536,7 +538,9 @@
 				top.Ext.getCmp("originalItems").setValue(originalItems);
 				
 				top.Ext.getCmp('tempName').setDisabled(false);
-				top.Ext.getCmp('batchNumber').setDisabled(false);
+				if(isDisposableGood){
+					top.Ext.getCmp('batchNumber').setDisabled(false);
+				}
 				top.Ext.getCmp('tempAmount').setDisabled(false);
 				top.Ext.getCmp('barcode').setDisabled(false);
 			},