Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r33077 -r34297
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 33077)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 34297)
@@ -340,57 +340,61 @@
                     progress:true,  
                     closable:false  
 	            });
-				for ( var i = 0; i < tousseInstances.length; i++) {
-					var tousseInstance = tousseInstances[i];
-					var toussName = tousseInstance.tousseName;
-					var barcode = tousseInstance.barcode;
-					var barocdeArray = barcode.split(",");
-					var virtualSeqNumArray = tousseInstance.virtualSeqNums.split(",");
-					for ( var j = 0; j < barocdeArray.length; j++) {
-						top.Ext.MessageBox.updateProgress((j + 1)/barocdeArray.length,'正在打印第' + (j + 1) + '个,共' + barocdeArray.length +  '个');
-						var tempPrintNum = printNum;
-						while(tempPrintNum > 0){
-						    var jsonObj = "";
-                            DWREngine.setAsync(false); 
-                            PackingTableManager.getMaterialByBarcode(barocdeArray[j],function(result){
-                                jsonObj = Ext.decode(result);
-                            });
-                            DWREngine.setAsync(true);
-                            var barcodePaperType = jsonObj.barcodePaperType;
-                            var materials = jsonObj.result;
-                            
-                            // 获取包装方式的简称
-        					var packageTypeAbbreviation = tousseInstance.packageTypeAbbreviation;
-//        					DWREngine.setAsync(false);
-//        					TousseInstanceTableManager.getPackageTypeAbbreviation(packageType,function(_packageTypeAbbreviation){
-//        						packageTypeAbbreviation = _packageTypeAbbreviation;
-//        					});
-//        					DWREngine.setAsync(true);
-        					
-        					var barcodes = [barocdeArray[j]];
-                            var obj = {'barcodes':barcodes, 'name':toussName, 'name':toussName, 'nameWithoutDepart':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
-                    				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
-                    				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
-                            obj.sterilizerName = sterilizer;
-                            obj.sterileFrequency = frequency;
-                            obj.virtualBasketSeqNum = [virtualSeqNumArray[j]];
-                            obj.virtualSeqNums = [virtualSeqNumArray[j]];
-                            obj.department = department;
-                            obj.depart = department;
-                            obj.packTime = packTime;
-                            //自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室
-                            obj.printOrgSource = tousseInstance.printOrgSource;
-                            if(selectedDepartment){
-                            	if(obj.printOrgSource == '无'){// 如果选了科室，自定义装配，始终打印科室
-                            		obj.printOrgSource = '回收科室';
-                            		obj.department = selectedDepartment;
-                                    obj.depart = selectedDepartment;
-                            	}
-                            }
-                            top.Ext4.applyIf(obj,tousseInstance);
-                            top.Ext4.applyIf(obj,names);
-                            doPrintLabel(obj);
-                            tempPrintNum--;
+				if(printNum > 0){
+					for(var k=0;k<printNum;k++){
+						for ( var i = 0; i < tousseInstances.length; i++) {
+							var tousseInstance = tousseInstances[i];
+							var toussName = tousseInstance.tousseName;
+							var barcode = tousseInstance.barcode;
+							var virtualSeqNumArray = tousseInstance.virtualSeqNums.split(",");
+							top.Ext.MessageBox.updateProgress((i + 1)/tousseInstances.length,'正在打印第' + (i + 1) + '个,共' + tousseInstances.length +  '个');
+							var jsonObj = "";
+							DWREngine.setAsync(false); 
+							PackingTableManager.getMaterialByBarcode(barcode,function(result){
+								jsonObj = Ext.decode(result);
+							});
+							DWREngine.setAsync(true);
+							var barcodePaperType = jsonObj.barcodePaperType;
+							var materials = jsonObj.result;
+							
+							// 获取包装方式的简称
+							var packageTypeAbbreviation = tousseInstance.packageTypeAbbreviation;
+							var barcodes = [barcode];
+							var obj = {'barcodes':barcodes, 'name':toussName, 'name':toussName, 'nameWithoutDepart':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
+									'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
+									'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
+							obj.sterilizerName = sterilizer;
+							obj.sterileFrequency = frequency;
+							obj.virtualBasketSeqNum = [virtualSeqNumArray[0]];
+							obj.virtualSeqNums = [virtualSeqNumArray[0]];
+							obj.department = department;
+							obj.depart = department;
+							obj.packTime = packTime;
+							obj.indexInColumn = i;
+							if(i == 0){
+								obj.noInitPrinting = null;
+							}else{
+								obj.noInitPrinting = true;
+							}
+							if(i == tousseInstances.length-1){
+								obj.noPrinting = null;
+							}else{
+								obj.noPrinting = true;
+							}
+							//自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室
+							obj.printOrgSource = tousseInstance.printOrgSource;
+							if(selectedDepartment){
+								if(obj.printOrgSource == '无'){// 如果选了科室，自定义装配，始终打印科室
+									obj.printOrgSource = '回收科室';
+									obj.department = selectedDepartment;
+									obj.depart = selectedDepartment;
+								}
+							}
+							top.Ext4.applyIf(obj,tousseInstance);
+							top.Ext4.applyIf(obj,names);
+							doPrintLabel(obj);
+							obj.noInitPrinting = null;
+							obj.noPrinting = null;
 						}
 					}
 				}