Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r28577 -r28578
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 28577)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 28578)
@@ -214,6 +214,7 @@
         return false;
 	}
 	var defaultTousseAmount = [];
+	var minTousseAmount = [];
 	var maxGroup = [];
 	var msg = '';
 	for(var i = 0 ; i < records.length ; i++){
@@ -225,17 +226,17 @@
 		if(amount == 0){
 			msg = tousseName+"的聚合数量必须大于0！";
 		}
-		
-		if(amount < tousseAmount){
-			msg = tousseName+"的可聚合数量小于默认聚合数量，不能一键聚合！";
-        }
-		
+
 		if(amount > maxAmount){
 			msg = tousseName+"的聚合数量不能大于可装配数量！";
 		}
 		
+		if(amount < tousseAmount){
+			minTousseAmount.push(tousseName);
+		}
+		
 		if(tousseAmount == 0){
-			defaultTousseAmount.push(tousseName)
+			defaultTousseAmount.push(tousseName);
 		}
 
 		maxGroup[i] = parseInt(amount/tousseAmount);
@@ -246,6 +247,11 @@
         return false;
 	}
 
+	if(minTousseAmount.length > 0){
+		showResult(minTousseAmount.join(',')+"的可聚合数量小于默认聚合数量，不能一键聚合！");
+        return false;
+	}
+
 	if(defaultTousseAmount.length > 0){
 		showResult(defaultTousseAmount.join(',')+"没有设置默认的聚合数量，请设置后再进行一键聚合");
         return false;