Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r14580 -r14701
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14580)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14701)
@@ -995,6 +995,22 @@
 	autoLoad : true
 });
 
+var tousseWeightStore = new Ext4.data.Store({
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do',
+		extraParams: {
+			optionId: 'tousseWeight'
+		},
+		reader : {
+			type: 'json',
+			root: 'data'
+		}
+	},
+	fields : ['value'],
+	autoLoad : true
+});
+
 function deleteTask(tousseName,packAmount,taskItemArray){
 	var basketTree = Ext4.getCmp('basketTreeGrid');
 	var rootNode = basketTree.getRootNode();
@@ -1333,6 +1349,28 @@
 		}
     
 	},{
+		columnWidth :.47,
+		xtype : 'combo',
+//		hidden : !sstsConfig.showTousseWeight,
+		fieldLabel : '重量',
+		id : 'tousseWeight',
+		name : 'tousseWeight',
+		componentCls:'formItemMgn',
+		minChars : 0,
+		labelWidth:60,
+		labelAlign:'right',
+		valueField : 'value',
+		displayField: 'value',
+		labelAlign:'right',
+		store : tousseWeightStore,
+		forceSelection : true,
+		lazyInit : true,
+		anchor : '95%',
+		editable:false,
+		triggerAction : 'all',
+		typeAhead : false,
+		allowBlank : true
+	},{
 		columnWidth :.5,
 	     xtype : 'combo',
     	 fieldLabel : '灭菌炉',
@@ -2214,6 +2252,8 @@
 	if(!validateFormParamsForPack()){
 		return false;
 	}
+	var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
+	
     //是否消毒物品
     var validatepass = true;
     DWREngine.setAsync(false);
@@ -2264,11 +2304,34 @@
     	}
     }
     
+    var params = {
+    		taskIds: taskIds,
+    		inspector: inspector,
+    		inspectorCode: inspectorCode,
+    		operator: operator,
+    		operatorCode: operatorCode,
+    		reviewer: reviewer,
+    		reviewerCode: reviewerCode,
+    		wrapper: wrapper,
+    		wrapperCode: wrapperCode,
+    		packageType: packageType,
+    		sterilingType: sterilingType,
+    		sterileDate: sterileDate.getTime(),
+    		stock: stock,
+    		packAmount: packAmount,
+    		taskGroup: taskGroup,
+    		splitPackage: null,
+			basketBarcode: basketBarcode,
+			idCardInstanceID: idCardInstanceID,
+			sterilizer: sterilizer,
+			frequency: frequency,
+			confirmContinue: '',
+			urgentAmount: urgentAmount,
+			tousseWeight: tousseWeight
+	}
     DWREngine.setAsync(false);
     // 调用服务端的装配器械包的代码
-    PackingTableManager.packingTousse2(taskIds,inspector,inspectorCode,operator,operatorCode,reviewer,reviewerCode,wrapper,wrapperCode,packageType,
-         sterilingType,sterileDate,stock,packAmount,taskGroup,null,basketBarcode,idCardInstanceID,
-         sterilizer,frequency,"",urgentAmount,function(rs){
+    PackingTableManager.packingTousse2(JSON.stringify(params),function(rs){
         if(rs != null){
             var result = Ext4.decode(rs);
         	var showName = tousseName;
@@ -2285,9 +2348,8 @@
             				function(btn) {
             					if (btn == 'yes') {
             						//输入一个true的参数
-            						PackingTableManager.packingTousse2(taskIds,operator,operatorCode,reviewer,reviewerCode,packageType,
-            						         sterilingType,sterileDate,stock,packAmount,taskGroup,null,basketBarcode,idCardBarcode,
-            						         sterilizer,frequency,"true",urgentAmount,function(rs1){
+            						params.confirmContinue = 'true';
+            						PackingTableManager.packingTousse2(JSON.stringify(params),function(rs1){
             					        if(rs1 != null){
             					            var result = Ext4.decode(rs1);
             					            
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
===================================================================
diff -u -r14361 -r14701
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js	(.../printConfig.js)	(revision 14361)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js	(.../printConfig.js)	(revision 14701)
@@ -972,6 +972,12 @@
 	LODOP.ADD_PRINT_TEXT("12mm","30mm","30mm","6mm", "审核:"+obj.reviewer);
 	setFontSizeBold(10,0);// 设置字体
 	
+	if(!isUndefinedOrNullOrEmpty(obj.weight)){
+		LODOP.ADD_PRINT_TEXT("17mm","0mm","10mm","10mm", obj.weight);
+		setFontSizeBold(6,0);// 设置字体
+		setAlignment('center');// 对齐
+	}
+	
 	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 }
 function printSmallLabel2_fdzl(obj){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r14624 -r14701
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 14624)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 14701)
@@ -98,6 +98,7 @@
 				{name : 'applicant'},
 				{name : 'maker'},
 				{name : 'assistant'},
+				{name : 'weight'},
 				{name : 'applicantDepart'}
 			]
 		}),
@@ -413,6 +414,7 @@
 
 						}
 						else{
+							top.Ext4.applyIf(tousseObj,records[i].data);
 							//打印消毒物品
 							if(tousseObj.isDisinfection){
 								printLabelOfDisinfection(tousseObj);