Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r38532 -r38598
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38532)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38598)
@@ -3462,7 +3462,7 @@
 			}, {
 				columnWidth: .5,
 				xtype: 'combo',
-				hidden: !sstsConfig.showTousseWeight,
+				hidden: !(!(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight) && sstsConfig.showTousseWeight),
 				fieldLabel: '重量',
 				id: 'tousseWeight',
 				name: 'tousseWeight',
@@ -3481,6 +3481,20 @@
 				triggerAction: 'all',
 				typeAhead: false,
 				allowBlank: true
+			}, {
+				columnWidth: .5,
+				xtype: 'numberfield',
+				fieldLabel: '重量',
+				allowNegative: false,
+				id: 'weight',
+				name: 'weight',
+				hidden: !(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight),
+				componentCls: 'formItemMgn',
+				minValue: 0,
+				labelWidth: 90,
+				labelAlign: 'right',
+				allowBlank: true,
+				anchor: '95%'
 			},{
 				xtype:'hidden',
 				id:'useOldRemark',
@@ -5969,6 +5983,7 @@
 		}
 		var params = paramsObj;
 		var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
+		var weight = Ext4.getCmp('weight').getValue();
 		var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue();
 		var secondaryDisinfection = Ext4.getCmp('secondaryDisinfection').getValue();
 		//是否消毒物品
@@ -6055,6 +6070,7 @@
 		params.frequency = frequency;
 		params.confirmContinue = '';
 		params.tousseWeight = tousseWeight;
+		params.weight = weight;
 		params.sterilizedThisTime = sterilizedThisTime;
 		params.secondaryDisinfection = secondaryDisinfection;
 		params.websocketSessionId = getWebsocketSessionId();
@@ -7490,6 +7506,13 @@
 				if (!checked) {
 					deselectCheckAll();
 				}
+				if(node.data.tousseType == '外来器械包' && checked){
+					Ext4.getCmp('weight').enable();
+					Ext4.getCmp('weight').setValue(node.data.weight || '');
+				}else {
+					Ext4.getCmp('weight').disable();
+					Ext4.getCmp('weight').setValue('');
+				}
 			},
 			itemcontextmenu: taskItemMenu
 		},
@@ -7540,6 +7563,16 @@
 									getPackingMaterialsForCheckFun(rootNode.childNodes[0]);
 								}
 							}, 200);
+							if(rootNode.childNodes.length == 1 && rootNode.childNodes[0].data.tousseType == '外来器械包'){
+								Ext4.getCmp('weight').enable();
+								Ext4.getCmp('weight').setValue(rootNode.childNodes[0].data.weight || '');
+							}else {
+								Ext4.getCmp('weight').disable();
+								Ext4.getCmp('weight').setValue('');
+							}
+						}else {
+							Ext4.getCmp('weight').disable();
+							Ext4.getCmp('weight').setValue('');
 						}
 						showOrHidePrintBtn();
 						resetScanIDCardBarcodeVisibility();