Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
===================================================================
diff -u -r32962 -r33516
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 32962)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 33516)
@@ -511,10 +511,33 @@
 							triggerAction : 'all',
 							anchor : '100%'
 			         }]
-			   }, {
+			   	}, {
 					columnWidth : .33,
 					layout : 'form',
 					items:[{
+						xtype : 'combo',
+						fieldLabel : '是否打印到标签',
+						id : 'isPrintToLabel',
+						name : 'isPrintToLabel',
+						width : 130,
+						valueField : 'value',
+						displayField : 'value',
+						store : new Ext.data.SimpleStore({
+							fields : [ 'value' ],
+							data : [ ['是' ], ['否' ]]
+						}),
+						forceSelection : true,
+						allowBlank: true,
+						editable:false,
+						mode : 'local',
+						value:'是',
+						triggerAction : 'all',
+						anchor : '100%'
+					}]
+				}, {
+					columnWidth : .33,
+					layout : 'form',
+					items:[{
 						xtype: 'numberfield', 
 						fieldLabel: "顺序号",
 						allowDecimals:false,
@@ -727,7 +750,7 @@
       		  id : 'uploadFile',
       		  hidden:id == 0?true:false,
       		  handler : function(){
-      		    uploadMaterialImageFile(imageTypeMaterial,id);
+				uploadMaterialImageFile(imageTypeMaterial,id);
       		  }
       	  } ]
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
===================================================================
diff -u -r28614 -r33516
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 28614)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 33516)
@@ -514,10 +514,35 @@
 	var dataRowConfig = tableConfig.getTableDataItemRowConfig();
 	if(dataRowConfig != null){
 		var itemsPerRow = tableConfig.itemsPerRow;
-		var dataItems = obj[itemsPropName];
-		if(isUndefinedOrNull(dataItems)){
+		var dataItemsOld = obj[itemsPropName];
+		var dataItems = [];
+		if(isUndefinedOrNull(dataItemsOld)){
 			dataItems = [];
 		}
+		var columnConfigs = dataRowConfig.columnConfigs;
+		var sumName = false;
+		for(var i=0;i<columnConfigs.length;i++){
+			if(columnConfigs[i].innerHTML == '${item1.name}'){
+				sumName = true;
+			}
+		}
+		if(sumName){
+			var map = {};
+			for(var i=0;i<dataItemsOld.length;i++){
+				if(map[dataItemsOld[i].name]){
+					for(var k=0;k<dataItems.length;k++){
+						if(dataItems[k].name == dataItemsOld[i].name){
+							dataItems[k].count = parseInt(dataItems[k].count) + parseInt(dataItemsOld[i].count);
+						}
+					}
+				}else {
+					map[dataItemsOld[i].name] = true;
+					dataItems.push(dataItemsOld[i]);
+				}
+			}
+		}else {
+			dataItems = dataItemsOld;
+		}
 //		alert(itemsPropName)
 		var mod = dataItems.length % itemsPerRow;
 		var itemsCount = dataItems.length;