Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32980 -r32982
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32980)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32982)
@@ -1280,24 +1280,34 @@
 						record.set('amount',context.originalValue);
 						return;
 					}
+					var parentUnPackingAmount;
+					var maxAmount;
+					var unPackingAmount;
+					if(context.grid.id == 'waitPackingTreeGrid'){
+						parentUnPackingAmount = record.parentNode.get('unPackingAmount');
+						maxAmount = record.raw.maxAmount; 
+						unPackingAmount = record.get('unPackingAmount');
+					}else {
+						parentUnPackingAmount = record.parentNode.get('maxAmount');
+						maxAmount = record.data.maxAmount; 
+						unPackingAmount = record.get('maxAmount');
+					}
 					if(record.get('leaf')){
-						var unPackingAmount = record.parentNode.get('maxAmount');
 						var sum = 0;
 						Ext4.each(record.parentNode.childNodes, function(pNode) {
 							sum += parseInt(pNode.get('amount'));
 						});
-						if(context.value > record.data.maxAmount){
-							showResult(record.get('tousseName') + "的数量不能大于最大装配数量"+record.data.maxAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
+						if(context.value > maxAmount){
+							showResult(record.get('tousseName') + "的数量不能大于最大装配数量"+maxAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
 							record.set('amount',context.originalValue);
 							return;
 						}
-						if(sum > unPackingAmount){
-							showResult(record.get('tousseName') + ",装配数量不能大于"+unPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
+						if(sum > parentUnPackingAmount){
+							showResult(record.get('tousseName') + ",装配数量不能大于"+parentUnPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
 							record.set('amount',context.originalValue);
 							return;
 						}
 					}else {
-						var unPackingAmount = record.get('maxAmount');
 						if(unPackingAmount !== '' && unPackingAmount < context.value){
 							showResult(record.get('tousseName') + ",装配数量不能大于"+unPackingAmount , null , sstsConfig.messagePauseTimeOnPackingPage);
 							record.set('amount',unPackingAmount);