Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r40890 -r41342
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 40890)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 41342)
@@ -607,26 +607,51 @@
 							return;
 						}
 						if(resultObj.data.barcodeType == '条码信息'){
-//							var info = JSON.parse(resultObj.data.barcodeInformation.information);
 							var info = resultObj.data.barcodeInformation.information;
-							if(!isUndefinedOrNullOrEmpty(info.disposableGoodsName)){
-								top.Ext.getCmp('name1').setValue(info.disposableGoodsName);
-								top.Ext.getCmp('disposableGoodsID').setValue(info.disposableGoodsId);
-								batchNumStore.baseParams.disposableGoodsID = info.disposableGoodsId;
-								batchNumStore.load();
+							var disposableGoodsName = info.disposableGoodsName;
+							var disposableGoodsID = info.disposableGoodsId;
+							if(!isUndefinedOrNullOrEmpty(disposableGoodsName) && !isUndefinedOrNullOrEmpty(disposableGoodsID)){
+								var url = '/disinfectSystem/diposableGoodsAction!getDiposableGoodsDataWithStock.do';
+								if(sstsConfig.restrictGodownEntryDiposableGoods){
+									url = '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do';
+								}
+								Ext.Ajax.request({
+									url: WWWROOT + url,
+									params: { 
+										spell: disposableGoodsName
+									},
+									success: function(response ,options){
+										var result = Ext.decode(response.responseText);
+										var targetData = null;
+										if(result != null){
+											var data = result.data;
+											if(data && data.length > 0){
+												for(var i=0;i<data.length;i++){
+													if(data[i].id == disposableGoodsID){
+														targetData = data[i];
+														break;
+													}
+												}
+											}
+										}
+										if(targetData){
+											top.Ext.getCmp('name1').setValue(targetData.name);
+											top.Ext.getCmp('disposableGoodsID').setValue(targetData.id);
+											top.Ext.getCmp('cost1').setValue(info.price);
+											top.Ext.getCmp('hiddenItems').setValue(JSON.stringify(targetData));
+										}else{
+											showResult('输入的条码无效！');
+										}
+									},
+									failure: function(){
+										showResult('输入的条码无效！');
+									}
+								});
+							}else{
+								showResult('输入的条码无效！');
 							}
-							if(!isUndefinedOrNullOrEmpty(info.price)){
-								top.Ext.getCmp('cost1').setValue(info.price);
-							}
-							if(!isUndefinedOrNullOrEmpty(info.supplierName)){
-								top.Ext.getCmp('supplier1').setValue(info.supplierName);
-							}
-							if(!isUndefinedOrNullOrEmpty(info.certification)){
-								top.Ext.getCmp('certification1').setValue(info.certification);
-							}
-							top.Ext.getCmp('hiddenItems').setValue(JSON.stringify(info));
 						}else{
-							
+								showResult('输入的条码无效！');
 						}
 					}else{
 						showResult('输入的条码无效！');