Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
===================================================================
diff -u -r12981 -r12983
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12981)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12983)
@@ -756,17 +756,17 @@
 					showResult('请正确填写表单各值');
 					return false;
 				}
-				var items = null;
+				var items = '';
 				var records = top.Ext.getCmp('appropriateItemGrid').getSelectionModel().getSelections();
 				if (records.length == 0) {
 					showResult("请选择要打印的一次性物品！");
 					return false;
 				}
 				for ( var i = 0, len = records.length; i < len; i++) {
-					if(items != null){
+					if(items != ''){
 						items += ';'
 					}
-					items = records[i].data.id 
+					items += records[i].data.id 
 					+ ',' + records[i].data.disposableGoodsID 
 					+ ',' + records[i].data.amount 
 					+ ',' + records[i].data.cost 
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12966 -r12983
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12966)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12983)
@@ -966,7 +966,7 @@
 						window.close();
 						grid.dwrReload();
 						//打印条码
-						printBarcode(action.result.barcode,false);
+						commonEntry.printBarcode(action.result.barcode,false);
 
 					},
 					failure : function(form, action) {
@@ -1019,7 +1019,7 @@
 						window.close();
 						grid.dwrReload();
 						//打印条码
-						printBarcode(action.result.barcode,true);
+						commonEntry.printBarcode(action.result.barcode,true);
 
 					},
 					failure : function(form, action) {
@@ -1190,47 +1190,47 @@
   	}
   	
 }
-function printBarcode(barcodeStr,saveAndPrintNew){
-	if(barcodeStr!=null  && barcodeStr != "null" && barcodeStr.length > 0){
-		var godownEntryItem = barcodeStr.split(";");
-		var exitBatch  = true;
-		
-		if(saveAndPrintNew){
-			for ( var i = 0; i < godownEntryItem.length; i++) {
-				var resultItem = godownEntryItem[i].split("#&");
-				var name =resultItem[0];
-				var newBatch =resultItem[1];
-				var barcode = resultItem[2];
-				var expDate = resultItem[3];
-				var supplierName = resultItem[4];
-				var batchNumber = resultItem[5];
-				var sp = resultItem[6];
-				if(newBatch == true || newBatch == 'true'){
-					exitBatch = false;
-					printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,sp);
-				}
-			}
-			if(exitBatch){
-				showResult("本次入库物品没有新的批次。");
-			}
-		}else{
-			for ( var i = 0; i < godownEntryItem.length; i++) {
-				var resultItem = godownEntryItem[i].split("#&");
-				var name =resultItem[0];
-				var barcode = resultItem[1];
-				var expDate = resultItem[2];
-				var supplierName = resultItem[3];
-				var batchNumber = resultItem[4];
-				var sp = resultItem[5];
-				printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,sp);
-			}
-		}
-		
-		
-	}else{
-		showResult("本次入库物品没有新的批次。");
-	}
-}
+//function printBarcode(barcodeStr,saveAndPrintNew){
+//	if(barcodeStr!=null  && barcodeStr != "null" && barcodeStr.length > 0){
+//		var godownEntryItem = barcodeStr.split(";");
+//		var exitBatch  = true;
+//		
+//		if(saveAndPrintNew){
+//			for ( var i = 0; i < godownEntryItem.length; i++) {
+//				var resultItem = godownEntryItem[i].split("#&");
+//				var name =resultItem[0];
+//				var newBatch =resultItem[1];
+//				var barcode = resultItem[2];
+//				var expDate = resultItem[3];
+//				var supplierName = resultItem[4];
+//				var batchNumber = resultItem[5];
+//				var sp = resultItem[6];
+//				if(newBatch == true || newBatch == 'true'){
+//					exitBatch = false;
+//					printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,sp);
+//				}
+//			}
+//			if(exitBatch){
+//				showResult("本次入库物品没有新的批次。");
+//			}
+//		}else{
+//			for ( var i = 0; i < godownEntryItem.length; i++) {
+//				var resultItem = godownEntryItem[i].split("#&");
+//				var name =resultItem[0];
+//				var barcode = resultItem[1];
+//				var expDate = resultItem[2];
+//				var supplierName = resultItem[3];
+//				var batchNumber = resultItem[4];
+//				var sp = resultItem[5];
+//				printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,0,sp);
+//			}
+//		}
+//		
+//		
+//	}else{
+//		showResult("本次入库物品没有新的批次。");
+//	}
+//}
 // 打印入库单列表
 //function printGodownEntryListInternal(printType){
 //	  top.Ext.MessageBox.show({