Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
===================================================================
diff -u -r14914 -r15200
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 14914)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 15200)
@@ -969,15 +969,42 @@
 }
 // 小标签2
 var smallLabelConfig2 = {
-		customPrint:printSmallLabel2_gdsy
+		customPrint:printSmallLabel2_gdsy,
+		columnAmount: 2
 }
 
+function childXToParentX(cfg,index,x){
+	var topMargin = cfg.topMargin;
+	var leftMargin = cfg.leftMargin;
+	var innerXMargin = cfg.innerXMargin;
+	var childWidth = cfg.childWidth;
+//	alert(index)
+	var newX = leftMargin+(childWidth+innerXMargin)*index;
+	return newX+'mm';
+}
+function childYToParentY(cfg,index,y){
+	var topMargin = cfg.topMargin;
+	var newY = topMargin+y;
+	return newY;
+}
 function printSmallLabel2_gdsy(obj){
+	var columnAmount = 2;
+	var indexInColumn = obj.indexInColumn;
+//	alert(indexInColumn)
+	var topMargin = 2;
+	var leftMargin = 2;
+	var innerMargin = 2;
+	var cfg = {
+			topMargin:2,
+			leftMargin:2,
+			innerXMargin:2,
+			childWidth:40
+	}
 	doGetLodop();
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('4mm','0mm','4mm','50mm',0,1);
-		LODOP.ADD_PRINT_LINE('13mm','0mm','13mm','50mm',0,1);
+		LODOP.ADD_PRINT_LINE('4mm',childXToParentX(cfg,indexInColumn,0),'4mm',childXToParentX(cfg,indexInColumn,40),0,1);
+		LODOP.ADD_PRINT_LINE('13mm',childXToParentX(cfg,indexInColumn,0),'13mm',childXToParentX(cfg,indexInColumn,40),0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',12,1);
@@ -992,20 +1019,20 @@
 		                                  		{maxLen:20,fontSize:4},
 		                                		{maxLen:1000,fontSize:3}
 		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","1mm","RightMargin:0mm","3mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("1mm",childXToParentX(cfg,indexInColumn,1),"40mm","3mm", obj.name);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 
 	var sterilizationDate = "灭菌日期:"+obj.sterilizationDate+' ['+obj.virtualBasketSeqNum+']';
-	LODOP.ADD_PRINT_TEXT("4mm","1mm","RightMargin:0mm","3mm", sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("4mm",childXToParentX(cfg,indexInColumn,1),"40mm","3mm", sterilizationDate);
 	setFontSizeBold(7,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("7mm","1mm","RightMargin:0mm","3mm", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("7mm",childXToParentX(cfg,indexInColumn,1),"40mm","3mm", "失效日期:"+obj.validDate);
 	setFontSizeBold(7,0);// 设置字体
 	var line4 = "制作:"+obj.operator+'  核对:'+obj.reviewer;
-	LODOP.ADD_PRINT_TEXT("10mm","1mm","RightMargin:0mm","3mm", line4);
+	LODOP.ADD_PRINT_TEXT("10mm",childXToParentX(cfg,indexInColumn,1),"40mm","3mm", line4);
 	setFontSizeBold(7,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("13mm","5mm","30mm","7mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("13mm",childXToParentX(cfg,indexInColumn,5),"30mm","7mm","128Auto", obj.barcode);// 条码1
 }
 var middleLable2Config = {
 		table : {
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r15109 -r15200
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15109)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15200)
@@ -872,6 +872,21 @@
 	}
 	formTypeOfPrinted = formType;
 }
+function getFormTypeByPageType(tousseType,pageType){
+	var formType = pageTypeToFormTypeOfPrinted(tousseType,pageType);
+	if(formType == ''){
+		formType = "smallLabel";
+	}
+	return formType;
+}
+function getConfigObj(obj){
+	var formType = getFormTypeByPageType(obj.tousseType,obj.pageType);
+	var myObj = printConfig[formType];
+	if(isUndefinedOrNullOrEmpty(myObj)){
+		return null;
+	}
+	return myObj;
+}
 function pageTypeToFormTypeOfPrinted(tousseType,pageType){
 	var formType = '';
 	if(pageType == "加大标签"){
@@ -937,7 +952,9 @@
 			LODOP.SET_PRINTER_INDEX(printerName);
 		}
 		// jeff li 2015/6/26，增加选择打印机的功能
-		LODOP.PRINT();
+		if(isUndefinedOrNull(obj.noPrinting)){
+			LODOP.PRINT();
+		}
 //		LODOP.PRINT_DESIGN ();// 打印设计
 //		LODOP.PREVIEW();//打印预览
 	} else {
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r15188 -r15200
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 15188)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 15200)
@@ -167,6 +167,8 @@
             		});
             		DWREngine.setAsync(true);
             		var barcodePaperType = jsonObj.barcodePaperType;
+//            		 barcodePaperType = tousseObj.pageType;
+            		
             		var materials = [];
             		for(var i = 0; i < jsonObj.result.length;++i){
             			if(jsonObj.result[i].typeName != "一次性物品"){
@@ -219,28 +221,142 @@
  * 打印物品的标签
  */
 function doPrintLabels(tousses){
-	
+	tousses = createMultipleLabels(tousses);// 生成多份标签
+	tousses = groupLabels(tousses);// 标签分组
+//	for (var i=0;i<tousses.length;i++){
+//		var tousseObj = tousses[i];
+//		if(!tousseObj.isPrint){
+//			continue;
+//		}
+//		// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
+//		top.Ext.MessageBox.progress('【' + tousseObj.tousseName + '】打印中', '请稍候...');
+//		top.Ext.MessageBox.updateProgress((i + 1)/tousses.length,'第' + (i + 1) + '个,共' + tousses.length +  '个');
+//		var printAmount = tousseObj.printAmount;
+//		if(isUndefinedOrNull(printAmount)){
+//			printAmount = 1;
+//		}
+//		for(var pi=0;pi<printAmount;++pi){
+//			doPrintLabel(tousseObj);// 支持多份打印
+//		}
+//	}
+	var labelsAmount = 0;
+	var labelsCount = 1;
 	for (var i=0;i<tousses.length;i++){
+		labelsAmount += tousses[i].tousses.length;
+	}
+//	alert('labelsAmount='+labelsAmount)
+	if(labelsAmount == 0){
+		return;
+	}
+	// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
+//	top.Ext.MessageBox.progress('【' + tousseObj.tousseName + '】打印中', '请稍候...');
+	top.Ext.MessageBox.progress('打印中', '请稍候...');
+	for (var i=0;i<tousses.length;i++){
+		var toussesGroup = tousses[i];
+		var curGroupTousseAmount = toussesGroup.tousses.length;
+		if(curGroupTousseAmount == 0){
+			continue;
+		}
+		var columnAmount = toussesGroup.columnAmount;
+//		alert('columnAmount='+columnAmount)
+		if(columnAmount == 1){
+			for (var tgi=0;tgi<curGroupTousseAmount;tgi++){
+				top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+				doPrintLabel(toussesGroup.tousses[tgi]);
+				++labelsCount;
+			}
+		}else{
+			var cycleAmount = parseInt(curGroupTousseAmount/columnAmount);
+			if(curGroupTousseAmount % columnAmount != 0){
+				++cycleAmount;
+			}
+//			alert(cycleAmount)
+			for (var tgi=0;tgi<cycleAmount;tgi++){
+				for (var ci=0;ci<columnAmount;ci++){
+					top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+					var indexInGroup = tgi*columnAmount+ci;
+					var printObj = toussesGroup.tousses[indexInGroup];
+					printObj.indexInColumn = ci;
+					if(ci == columnAmount-1 || indexInGroup == curGroupTousseAmount-1){
+						printObj.noPrinting = null;
+					}else{
+						printObj.noPrinting = true;
+					}
+					doPrintLabel(printObj);
+					if(indexInGroup == curGroupTousseAmount-1){
+						break;
+					}
+					++labelsCount; 
+				}
+			}
+		}
+	}
+
+	hideMessageBox(true);
+
+}
+
+// 多份打印
+function createMultipleLabels(tousses){
+	var retTousses = [];
+	for (var i=0;i<tousses.length;i++){
 		var tousseObj = tousses[i];
 		if(!tousseObj.isPrint){
 			continue;
 		}
-		// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
-		top.Ext.MessageBox.progress('【' + tousseObj.tousseName + '】打印中', '请稍候...');
-		top.Ext.MessageBox.updateProgress((i + 1)/tousses.length,'第' + (i + 1) + '个,共' + tousses.length +  '个');
 		var printAmount = tousseObj.printAmount;
 		if(isUndefinedOrNull(printAmount)){
 			printAmount = 1;
 		}
 		for(var pi=0;pi<printAmount;++pi){
-			doPrintLabel(tousseObj);// 支持多份打印
+			retTousses.push(tousseObj);
 		}
 	}
-
-	hideMessageBox(true);
-
+	return retTousses;
 }
-
+// 根据配置重新排列要打印的物品，如果是多排标签，那么按照多排标签分组。
+function groupLabels(tousses){
+	var retTousses = [];
+	var oneColumnTousses = {
+			columnAmount:1,
+			tousses:[]
+	}
+	for (var i=0;i<tousses.length;i++){
+		var tousseObj = tousses[i];
+		if(!tousseObj.isPrint){
+			continue;
+		}
+		
+		var configObj = getConfigObj(tousseObj);
+		if(configObj == null){
+			continue;
+		}
+		var columnAmount = configObj.columnAmount;
+		if(isUndefinedOrNull(columnAmount) || columnAmount==1){
+			oneColumnTousses.tousses.push(tousseObj);
+		}else{
+			var pageType = tousseObj.pageType;
+			var toussesGroup = null;
+			for(var r=0;r<retTousses.length;++r){
+				if(pageType == retTousses[r].pageType){
+					toussesGroup = retTousses[r];
+					break;
+				}
+			}
+			if(toussesGroup == null){
+				toussesGroup = {
+						pageType:pageType,
+						columnAmount:columnAmount,
+						tousses:[]
+				}
+				retTousses.push(toussesGroup);
+			}
+			toussesGroup.tousses.push(tousseObj);
+		}
+	}
+	retTousses.push(oneColumnTousses);
+	return retTousses;
+}
 function doPrintLabel(tousseObj){
 	//打印消毒物品(如果为消毒物品,根据是否追溯的配置决定是否打印科室)。(消毒物品打印科室现在也改为同器械包一致，即按器械包定义的是否打印科室决定 since:2016-02-25)
 	if(tousseObj.isDisinfection){