Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r38894 -r39042
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 38894)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 39042)
@@ -365,6 +365,28 @@
 	}
 	tousseObj.operationTimeHHMM = jsonObj.operationTimeHHMM;
 	tousseObj.reviewTimeHHMM = jsonObj.reviewTimeHHMM;
+	//GZSZYY-74：器械包明细
+	var tousseInfo = '';
+	if(tousseObj.tousseName){
+		tousseInfo += '器械包名称：' + tousseObj.tousseName + '\r\n';
+	}
+	if(tousseObj.tousseBarcode){
+		tousseInfo += '器械包条码：' + tousseObj.tousseBarcode + '\r\n';
+	}
+	if(jsonObj.result && jsonObj.result.length > 0){
+		var sumAmount = 0;
+		tousseInfo += '材料明细：\r\n';
+		for(var k=0;k<jsonObj.result.length;k++){
+			tousseInfo += jsonObj.result[k].name + '：' + jsonObj.result[k].count + '\r\n';
+			sumAmount += jsonObj.result[k].count;
+		}
+		tousseInfo += '器械总材料数量：' + sumAmount;
+	}
+	if(tousseInfo == ''){
+		tousseObj.tousseInfo = '无法获取相应的器械包材料明细';
+	}else {
+		tousseObj.tousseInfo = tousseInfo;
+	}
 	if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
 		if(jsonObj.sterilizationPaperType && jsonObj.sterilizationPaperType !== '' && jsonObj.sterilizedThisTime == true){
 			jsonObj.barcodePaperType = jsonObj.sterilizationPaperType;
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r38700 -r39042
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 38700)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 39042)
@@ -93,6 +93,7 @@
     	}
     	// 固定属性
     	obj['barcode'] = '条码文本';
+		obj['tousseInfo'] = "器械包名称：包名\r\n器械包条码：010000001\r\n材料明细：\r\n材料1 * 1\r\n材料2 * 2\r\n器械总材料数量：3";
     	return obj;
     },
     getPreviewObj: function(){
@@ -103,6 +104,7 @@
     	}
     	// 固定属性
     	obj['barcode'] = '010000001';
+		obj['tousseInfo'] = "器械包名称：包名\r\n器械包条码：010000001\r\n材料明细：\r\n材料1 * 1\r\n材料2 * 2\r\n器械总材料数量：3";
     	return obj;
     }
 });
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r28471 -r39042
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 28471)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 39042)
@@ -123,6 +123,11 @@
 	LODOP.ADD_PRINT_BARCODE("1mm","1mm","20mm","20mm","QRCode", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0, "ContentVName", 'obj.barcode');// 设置内容参数的变量名
 }
+// GZSZYY-74：插入器械包明细（二维码）
+function insertTousseInfo(){
+	LODOP.ADD_PRINT_BARCODE("1mm","1mm","30mm","30mm","QRCode", "器械包名称：包名\r\n器械包条码：010000001\r\n材料明细：\r\n材料1 * 1\r\n材料2 * 2\r\n器械总材料数量：3");//器械包明细
+	LODOP.SET_PRINT_STYLEA(0, "ContentVName", 'obj.tousseInfo');// 设置内容参数的变量名
+}
 function insertBarcodeText() {
 	var propName = 'barcode';
 	getLODOP2();
@@ -481,6 +486,12 @@
     			handler : function() {
     				insertImplantAmountText();
     			}
+    		}, {
+    			xtype : 'button',
+    			text : '插入器械包明细(二维码)',
+    			handler : function() {
+    				insertTousseInfo();
+    			}
     		}]
 		},{
 			xtype:'fieldset',