Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.js
===================================================================
diff -u -r30577 -r33197
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 30577)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 33197)
@@ -182,12 +182,16 @@
 
 function loadReturnDiposableGoodsItem() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	var warehouseId = top.Ext.getCmp("cssdWareHouse").getValue();
+	var selectAll = true;
 	// 清除已加载的信息
 	top.Ext.getCmp("barcode").setValue('');// 清除条码
 	Ext.Ajax.request({
 				url : WWWROOT + '/disinfectSystem/receiveRecordAction!loadBarcodeDeviceInfo.do',
 				params : {
-					barcode : barcode
+					barcode : barcode,
+					warehouseId:warehouseId,
+					selectAll:selectAll
 				},
 				success : function(response, options) {
 					var result = response.responseText;
@@ -200,8 +204,22 @@
 						}
 						if(resultObj.barcodeType == '高值耗材'){
 							addExpensiveDisposablegoodsItems(resultObj.disposablegoods);
-						}else{
+						}else if(resultObj.barcodeType == '一次性物品'){
+							var obj = JSON.parse(resultObj.disposablegoods);
+							top.Ext.getCmp('diposableGoodsName').setValue(obj.showName);
+							top.Ext.getCmp('diposableGoodsID').setValue(obj.id);
 							
+							// 清空批次和价格
+							clearBatchNumberAndPrice();
+
+							if(resultObj.disposablegoodsBatchStock !== '[]'){
+								var batches = JSON.parse(resultObj.disposablegoodsBatchStock);
+								for(var i = 0;i<batches.length;i++){
+									batches[i].expDate = batches[i].expDateStr;
+									batches[i].displayBatchNumber = batches[i].batchNumber + "<font color='red'>（失效日期：" + batches[i].expDate + "）</font>";
+								}
+								setBatchNumbers(batches, true);
+							}
 						}
 					}else{
 						showResult('输入的条码无效！');
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js
===================================================================
diff -u -r30577 -r33197
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js	(.../godownOutView.js)	(revision 30577)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js	(.../godownOutView.js)	(revision 33197)
@@ -210,12 +210,16 @@
 }
 function loadBarcodeDeviceInfo() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	var warehouseId = top.Ext.getCmp('warehouseID').getValue();
+	var selectAll = false;
 	// 清除已加载的信息
 	top.Ext.getCmp("barcode").setValue('');// 清除条码
 	Ext.Ajax.request({
 				url : WWWROOT + '/disinfectSystem/receiveRecordAction!loadBarcodeDeviceInfo.do',
 				params : {
-					barcode : barcode
+					barcode : barcode,
+					warehouseId:warehouseId,
+					selectAll:selectAll
 				},
 				success : function(response, options) {
 					var result = response.responseText;
@@ -228,8 +232,22 @@
 						}
 						if(resultObj.barcodeType == '高值耗材'){
 							addExpensiveDisposablegoodsItems(resultObj.disposablegoods);
-						}else{
-							
+						}else if(resultObj.barcodeType == '一次性物品'){
+							var obj = JSON.parse(resultObj.disposablegoods);
+							top.Ext.getCmp('name1').setValue(obj.showName);
+							top.Ext.getCmp('disposableGoodsStockID').setValue(obj.id);
+							top.Ext.getCmp('cost').setValue(obj.referencePrice);
+							top.Ext.getCmp('supplierName').setValue(obj.supplierName || '');
+						
+							// 清空批次和价格
+							clearBatchNumberAndPrice();
+							if(resultObj.disposablegoodsBatchStock !== '[]'){
+								var batches = JSON.parse(resultObj.disposablegoodsBatchStock);
+								for(var i = 0;i<batches.length;i++){
+									batches[i].expDate = batches[i].expDateStr;
+								}
+								setBatchNumbers(batches, true);
+							}
 						}
 					}else{
 						showResult('输入的条码无效！');
@@ -662,7 +680,6 @@
 						// 清空批次和价格
 						clearBatchNumberAndPrice();
 						var wareHouseid = top.Ext.getCmp('warehouseID').getValue();
-//						DiposableGoodsTableManager.getBatchNumbersByDiposableGoodsId(record.data.id,"inStock",function(batchNumbers){
 						DiposableGoodsTableManager.getBatchsByDisposableGoodsStockIdAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){
 							var batches = JSON.parse(batchesStr);
 							for(var i = 0;i<batches.length;i++){
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r30577 -r33197
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 30577)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 33197)
@@ -213,12 +213,16 @@
 }
 function loadBarcodeDeviceInfo() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	var warehouseId = top.Ext.getCmp('warehouseID').getValue();
+	var selectAll = false;
 	// 清除已加载的信息
 	top.Ext.getCmp("barcode").setValue('');// 清除条码
 	Ext.Ajax.request({
 				url : WWWROOT + '/disinfectSystem/receiveRecordAction!loadBarcodeDeviceInfo.do',
 				params : {
-					barcode : barcode
+					barcode : barcode,
+					warehouseId:warehouseId,
+					selectAll:selectAll
 				},
 				success : function(response, options) {
 					var result = response.responseText;
@@ -231,8 +235,22 @@
 						}
 						if(resultObj.barcodeType == '高值耗材'){
 							addExpensiveDisposablegoodsItems(resultObj.disposablegoods);
-						}else{
-							
+						}else if(resultObj.barcodeType == '一次性物品'){
+							var obj = JSON.parse(resultObj.disposablegoods);
+							top.Ext.getCmp('name1').setValue(obj.showName);
+							top.Ext.getCmp('disposableGoodsStockID').setValue(obj.id);
+							top.Ext.getCmp('cost').setValue(obj.referencePrice);
+							top.Ext.getCmp('supplierName').setValue(obj.supplierName || '');
+						
+							// 清空批次和价格
+							clearBatchNumberAndPrice();
+							if(resultObj.disposablegoodsBatchStock !== '[]'){
+								var batches = JSON.parse(resultObj.disposablegoodsBatchStock);
+								for(var i = 0;i<batches.length;i++){
+									batches[i].expDate = batches[i].expDateStr;
+								}
+								setBatchNumbers(batches, true);
+							}
 						}
 					}else{
 						showResult('输入的条码无效！');
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
===================================================================
diff -u -r30389 -r33197
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 30389)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 33197)
@@ -188,12 +188,16 @@
 
 function loadReturnDiposableGoodsItem() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	var warehouseId = top.Ext.getCmp("cssdWareHouse").getValue()
+	var notShowZeroStorage = sstsConfig.notShowZeroStorage ? false : true;
 	// 清除已加载的信息
 	top.Ext.getCmp("barcode").setValue('');// 清除条码
 	Ext.Ajax.request({
 				url : WWWROOT + '/disinfectSystem/receiveRecordAction!loadBarcodeDeviceInfo.do',
 				params : {
-					barcode : barcode
+					barcode : barcode,
+					warehouseId:warehouseId,
+					selectAll:notShowZeroStorage
 				},
 				success : function(response, options) {
 					var result = response.responseText;
@@ -206,8 +210,22 @@
 						}
 						if(resultObj.barcodeType == '高值耗材'){
 							addExpensiveDisposablegoodsItems(resultObj.disposablegoods);
-						}else{
+						}else if(resultObj.barcodeType == '一次性物品'){
+							var obj = JSON.parse(resultObj.disposablegoods);
+							top.Ext.getCmp('diposableGoodsName').setValue(obj.showName);
+							top.Ext.getCmp('diposableGoodsID').setValue(obj.id);
 							
+							// 清空批次和价格
+							clearBatchNumberAndPrice();
+
+							if(resultObj.disposablegoodsBatchStock !== '[]'){
+								var batches = JSON.parse(resultObj.disposablegoodsBatchStock);
+								for(var i = 0;i<batches.length;i++){
+									batches[i].expDate = batches[i].expDateStr;
+									batches[i].displayBatchNumber = batches[i].batchNumber + "<font color='red'>（失效日期：" + batches[i].expDate + "）</font>"; 
+								}
+								setBatchNumbers(batches, true);
+							}
 						}
 					}else{
 						showResult('输入的条码无效！');