Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r13469 -r13741
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 13469)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 13741)
@@ -94,7 +94,70 @@
 	  configStore.add(p);// 插入到最后一行 
 	  top.Ext.getCmp('configGrid').startEditing(n, 0);// 开始编辑0单元格 
 }
+function setMaterialSequence(){
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	for(var i=0;i<configStore.getCount();++i){
+		var record = configStore.getAt(i);
+		record.set('sequence',i+1);
+	}
+}
+function moveTopMaterial() {
+	var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();// 返回值为所点击的行
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			var index = configStore.indexOf(rows[i]);
+			if (index != 0) {
+				configStore.remove(rows[i]);
+				configStore.insert(0, rows[i]);
+			}
+		}
+	}
+}
 
+function moveUpMaterial() {
+	var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();// 返回值为所点击的行
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			var index = configStore.indexOf(rows[i]);
+			if (index != 0) {
+				configStore.remove(rows[i]);
+				configStore.insert(index - 1, rows[i]);
+			}
+		}
+	}
+}
+
+function moveDownMaterial() {
+	var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();// 返回值为所点击的行
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			var index = configStore.indexOf(rows[i]);
+			var total = configStore.getCount();
+			if (index != total - 1) {
+				configStore.remove(rows[i]);
+				configStore.insert(index + 1, rows[i]);
+			}
+		}
+	}
+}
+
+function moveBottomMaterial() {
+	var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();// 返回值为所点击的行
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			var index = configStore.indexOf(rows[i]);
+			var total = configStore.getCount();
+			if (index != total - 1) {
+				configStore.remove(rows[i]);
+				configStore.insert(total - 1, rows[i]);
+			}
+		}
+	}
+}
 function setFieldsHide(hidden){
 	if(hidden){
 //		top.Ext.getCmp("printTDBarcode").hide();
@@ -293,7 +356,7 @@
 			method : "POST"
 		}),
 		reader : new top.Ext.data.JsonReader({
-			fields : [ "id", "name", "type", "count"]
+			fields : [ "id", "name", "type", "count", "sequence"]
 		})
 	});
 	
@@ -356,6 +419,7 @@
 	}, {
 		id	: 'count',
 		header : "数量",
+		width : 40,
 		dataIndex : 'count',
 		editor : new top.Ext.form.TextField( {
 			allowBlank : false,
@@ -369,6 +433,19 @@
 			  }
 			}
 		})
+	},{
+		id : 'moveItem',
+		header:'移动',
+		width : 100,
+		renderer: function(v,p,record){
+			var str = "<img src=" + WWWROOT + "'/images/web/tango-icon-go-top.png' onclick=\"getCurrentTab().moveTopMaterial()\">"
+			+ "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-up.png' onclick=\"getCurrentTab().moveUpMaterial()\">"
+			+ "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-down.png' onclick=\"getCurrentTab().moveDownMaterial()\">"
+			+ "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-bottom.png' onclick=\"getCurrentTab().moveBottomMaterial()\">";
+			return str;
+		},
+		menuDisabled : true,
+		dataIndex:'id'
 	}, {
 		id	: 'type',
 		header : "类型",
@@ -1611,48 +1688,49 @@
 						top.Ext.getCmp('vedioNamesForDisplay').setValue(videoName);
 					}
 				}
-				
-				for(var i = 0 ;i < tousseDefinition.materialInstances.length;i++){
-					var materialName = tousseDefinition.materialInstances[i].materialDefinition.name;
-					var name = materialName;
-					var sp = tousseDefinition.materialInstances[i].materialDefinition.specification;
-					if(sp!=null && sp != ''){
-						materialName += "["+sp+"]";
+				for(var i = 0 ;i < tousseDefinition.tousseDefinitionMaterials.length;i++){
+					var tousseDefinitionMaterial = tousseDefinition.tousseDefinitionMaterials[i];
+					if(tousseDefinitionMaterial.type=='器械'){
+						var materialName = tousseDefinitionMaterial.materialDefinition.name;
+						var name = materialName;
+						var sp = tousseDefinitionMaterial.materialDefinition.specification;
+						if(sp!=null && sp != ''){
+							materialName += "["+sp+"]";
+						}
+						var mi = tousseDefinitionMaterial;
+						var material = new materialDefinitionConfig({
+							id : mi.id,
+							name : materialName,
+							type : '器械',
+							count : mi.count
+						});
+						var m = new materialConfig({
+							  id : mi.id,
+							  count:mi.count,
+							  materileName : materialName,
+							  name : name,
+							  specification : sp,
+							  snumber : ''
+								  
+						  });
+						configStore.add(material);
+						signMaterilenStore.add(m);
+					}else{
+						var goodsName = tousseDefinitionMaterial.diposableGoods.name;
+						var specification = tousseDefinitionMaterial.diposableGoods.specification;
+						if(specification != null && specification != ""){
+							goodsName += "["+specification+"]"; 
+						}
+						var material = new materialDefinitionConfig({
+							id : tousseDefinitionMaterial.id,
+							name : goodsName,
+							type : '一次性物品',
+							count : tousseDefinitionMaterial.amount
+						});
+						configStore.add(material);
 					}
-					var mi = tousseDefinition.materialInstances[i];
-					var material = new materialDefinitionConfig({
-						id : mi.id,
-						name : materialName,
-						type : '器械',
-						count : mi.count
-					});
-					var m = new materialConfig({
-						  id : mi.id,
-						  count:mi.count,
-						  materileName : materialName,
-						  name : name,
-						  specification : sp,
-						  snumber : ''
-							  
-					  });
-					configStore.add(material);
-					signMaterilenStore.add(m);
 				}
 				
-				for(var i = 0 ;i < tousseDefinition.diposableGoodsItems.length;i++){
-					var goodsName = tousseDefinition.diposableGoodsItems[i].diposableGoods.name;
-					var specification = tousseDefinition.diposableGoodsItems[i].diposableGoods.specification;
-					if(specification != null && specification != ""){
-						goodsName += "["+specification+"]"; 
-					}
-					var material = new materialDefinitionConfig({
-						id : tousseDefinition.diposableGoodsItems[i].id,
-						name : goodsName,
-						type : '一次性物品',
-						count : tousseDefinition.diposableGoodsItems[i].amount
-					});
-					configStore.add(material);
-				}
 				
 				var tousseType = top.Ext.getCmp('tousseType').getValue();
 				var isTraceable = top.Ext.getCmp('isTraceable').getValue();
@@ -1757,17 +1835,23 @@
 
 function validateAndSubmit2(TousseName){
 	var rowIndex = top.Ext.getCmp('configGrid').getStore().getCount();//grid的行数 
-	var materialDefinitionConfigResult = "";
+	var materials = [];
 	var configStore = top.Ext.getCmp('configGrid').getStore();
+	// 设置序号
+	setMaterialSequence();
 	for(var i =0 ;i < rowIndex ; i++ ){
 		var record = configStore.getAt(i);
 		var name = record.get('name');
 		var count = record.get('count');
 		var type = record.get('type');
-		materialDefinitionConfigResult += "{name:'"+name+"',tousseType:'"+type+"',count:"+count+"}";
-		if(i != (rowIndex-1)){
-			materialDefinitionConfigResult += ",";
+		var sequence = record.get('sequence');
+		var material = {
+				name: name,
+				tousseType: type,
+				count: count,
+				sequence: sequence
 		}
+		materials.push(material);
 	}
 	var validateId = (TousseName ==null? top.Ext.getCmp('id').getValue():null);
 	var validateName = (TousseName ==null? top.Ext.getCmp('name').getValue():TousseName);
@@ -1791,7 +1875,7 @@
 					method : 'POST',
 					waitMsg : '正在保存数据，请稍候',
 					waitTitle : '提交表单',
-					params : {materialDefinitionConfigResult : "["+materialDefinitionConfigResult+"]"},
+					params : {materialDefinitionConfigResult : JSON.stringify(materials)},
 					success : function(form, action) {
 						tousseWin.close();
 						showResult('保存成功');
@@ -1863,7 +1947,6 @@
 	});
 }
 
-
 function printTDBarcode(id){
 	if(id != null && id > 0){
 		var records = grid.getSelectionModel().getSelections();
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
===================================================================
diff -u -r13692 -r13741
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 13692)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 13741)
@@ -1266,8 +1266,8 @@
 	tableHtml += "</tr>";
 	
 	var materials = [];
-	if(!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)){
-		materials = idCardInstance.tousseDefinition.materialInstances;
+	if(!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.tousseDefinitionMaterials)){
+		materials = idCardInstance.tousseDefinition.tousseDefinitionMaterials;
 	}
 	var total = materials.length;
 	var isEven = true;  //判断材料的数量是奇数还是偶数
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r13690 -r13741
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 13690)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 13741)
@@ -2020,6 +2020,21 @@
 		}
 		materialInstances.push(materialInstance);
 	}
+	// 设置到tousseDefinitionMaterials里面
+	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.tousseDefinitionMaterials)){
+		idCardInstance.tousseDefinition.tousseDefinitionMaterials = [];
+	}
+	var tousseDefinitionMaterials = idCardInstance.tousseDefinition.tousseDefinitionMaterials;
+	for(var i=0;i<tousseDefinitionMaterials.length;++i){
+		var tousseDefinitionMaterial = tousseDefinitionMaterials[i];
+		if(tousseDefinitionMaterial.type == '一次性物品'){
+			tousseDefinitionMaterial.materialDefinition = {
+					name: tousseDefinitionMaterial.diposableGoods.name,
+					specification: tousseDefinitionMaterial.diposableGoods.specification
+				}
+			tousseDefinitionMaterial.count = tousseDefinitionMaterial.amount;
+		}
+	}
 }
 function printIDCardLargeLabel_default(idCardInstance){
 	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){