Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37304 -r37305
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37304)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37305)
@@ -2490,6 +2490,10 @@
 				name: 'sterilizationPackageType'
 			}, {
 				xtype: 'hidden',
+				id: 'oldPackageType',
+				name: 'oldPackageType'
+			}, {
+				xtype: 'hidden',
 				id: 'note'
 			}, {
 				columnWidth: .5,
@@ -3003,6 +3007,9 @@
 								if(sterilizationPackageType !== ''){
 									Ext4.getCmp('packageType').setValue(sterilizationPackageType);
 								}
+							}else {
+								var oldPackageType = Ext4.getCmp('oldPackageType').getValue();
+								Ext4.getCmp('packageType').setValue(oldPackageType);
 							}
 						}
 					}
@@ -4535,6 +4542,9 @@
 				}
 			});
 		}
+		if(sstsConfig.enablePackingMultipleGoodsWithRemarks){
+			return true;
+		}
 		if (totalPackingAmount > 1) {
 			showMultipleResult("备注不为空时，只能装配一个包!", null, sstsConfig.messagePauseTimeOnPackingPage);
 			return false;
@@ -6376,6 +6386,7 @@
 			var sterilizationPackageType = '';
 			var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue();
 			var isSterile = record.get('isSterile');
+			Ext4.getCmp('oldPackageType').setValue(packageType);
 			if(isSterile == '可选'){
 				Ext4.getCmp('sterilizedThisTime').show();
 				Ext4.getCmp('secondaryDisinfection').show();
@@ -6396,7 +6407,6 @@
 				Ext4.getCmp('sterilizedThisTime').hide();
 				Ext4.getCmp('secondaryDisinfection').hide();
 			}
-			
 		}
 
 		lastSelectedTousseName = tousseName;
@@ -6456,6 +6466,9 @@
 					Ext4.getCmp('updateSterilingTypeButton').enable();
 					sterilizerTypeStore.reload();
 				}
+				if(sstsConfig.enablePackingMultipleGoodsWithRemarks){
+					Ext4.getCmp('remark').enable();
+				}
 			} else {
 				Ext4.getCmp('sterilingType').disable();
 				Ext4.getCmp('packageType').disable();