Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r28578 -r28599
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 28578)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 28599)
@@ -208,20 +208,18 @@
 	var waitComboTousseGrid = top.Ext4.getCmp("waitComboTousseGrid");
 	var waitComboTousseStore = waitComboTousseGrid.getStore();
 	
-	var records = waitComboTousseGrid.getSelectionModel().getSelection();
-	if (records.length == 0) {
-        showResult("请选择！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-	}
+	var store = waitComboTousseGrid.getStore();
+	var count = store.getCount();
 	var defaultTousseAmount = [];
 	var minTousseAmount = [];
 	var maxGroup = [];
 	var msg = '';
-	for(var i = 0 ; i < records.length ; i++){
-		var tousseAmount = records[i].raw.tousseAmount || 0;//默认设置聚合数量
-		var tousseName = records[i].raw.tousseName;
-		var amount = records[i].data['amount'];//拆分数量
-		var maxAmount = records[i].data["maxAmount"];//总数量
+	for(var i = 0 ; i <count ; i++){
+		var record = store.getAt(i);
+		var tousseAmount = record.data['tousseAmount'] || 0;//默认设置聚合数量
+		var tousseName = record.data['tousseName'];
+		var amount = record.data['amount'];//拆分数量
+		var maxAmount = record.data["maxAmount"];//总数量
 		
 		if(amount == 0){
 			msg = tousseName+"的聚合数量必须大于0！";
@@ -260,33 +258,40 @@
 	var min = Math.min.apply(null,maxGroup);
 	for(var k=0;k<min;k++){
 		var items = [];
-		for(var i = 0 ; i < records.length ; i++){
-			var id = records[i].data["id"];
-			var tousseName = records[i].data["tousseName"];
-			var amount = records[i].data['amount'];//拆分数量
-			var maxAmount = records[i].data["maxAmount"];//总数量
-			var packageType = records[i].data["packageType"];
-			var tousseAmount = records[i].raw.tousseAmount//默认设置聚合数量
-			
-			var isExist = isExistErrorOrDamage(records[i]);
+		var nums = [];
+		for(var i = 0 ; i < count ; i++){
+			var isExist = isExistErrorOrDamage(record);
 			if(!isExist){
+				var record = store.getAt(i);
+				var id = record.data["id"];
+				var tousseName = record.data["tousseName"];
+				var amount = record.data['amount'];//拆分数量
+				var maxAmount = record.data["maxAmount"];//总数量
+				var packageType = record.data["packageType"];
+				var tousseAmount = record.raw.tousseAmount//默认设置聚合数量
 				var addItem = {
 					id : id,
 					tousseName : tousseName,
+					tousseAmount:tousseAmount,
 					amount : tousseAmount,
 					packageType : packageType
 				};
 				items.push(addItem);
-				if(tousseAmount == maxAmount){
-					waitComboTousseStore.remove(records[i]);
-				}else{
-					var num = Number(maxAmount) - Number(tousseAmount);
-					records[i].set('amount', num);
-					records[i].set('maxAmount', num);
+				var num = Number(maxAmount) - Number(tousseAmount);
+				record.set('amount', num);
+				record.set('maxAmount', num);
+
+				if(num == 0){
+					nums.push(i);
 				}
 			}
 		}
 
+		for(var z=0;z<nums.length;z++){
+			var index = nums[z];
+			waitComboTousseStore.remove(store.getAt(index));
+		}
+
 		addToComboTousseGrid(items);
 	}
 }
@@ -304,7 +309,8 @@
     for ( var i = 0; i < items.length; i++) {
         var record = items[i];
         var id = record.id;
-        var tousseName = record.tousseName;
+		var tousseName = record.tousseName;
+		var tousseAmount = record.tousseAmount;
         var amount = record.amount;
         var packageType = record.packageType;
         
@@ -317,7 +323,8 @@
         
         var tousseObj = {};
         tousseObj.id = id;
-        tousseObj.tousseName = tousseName;
+		tousseObj.tousseName = tousseName;
+		tousseObj.tousseAmount = tousseAmount;
         tousseObj.amount = amount;
         tousseObj.packageType = packageType;
         tousseJsonArray.push(tousseObj);
@@ -722,8 +729,9 @@
         	    {name : 'maxAmount',mapping : 'maxAmount'},
         	    {name : 'packageType',mapping : 'packageType'},
         	    {name : 'errorAmount',mapping : 'errorAmount'},
-        	    {name : 'damageAmount',mapping : 'damageAmount'},
-        	    {name : 'unWashAmount',mapping : 'unWashAmount'}
+				{name : 'damageAmount',mapping : 'damageAmount'},
+				{name : 'unWashAmount',mapping : 'unWashAmount'},
+        	    {name : 'tousseAmount',mapping : 'tousseAmount'}
         	]
         }),
     	columns:[{
@@ -828,7 +836,9 @@
 				}
 			}
         },
-		columns:[{
+		columns:[new Ext.grid.RowNumberer({
+			width:35
+		}),{
 	        header : "聚合包名称",
 	        dataIndex : 'tousseName',
 	        sortable:false,
@@ -1542,19 +1552,20 @@
 		return true;
     }
     function getDefAmount(record,defNum){
-    	var defAmount = {};                
-        
+    	var defAmount = {};       
         var includeTousseJsonArray = record.get('includeTousseJsonArray');
         for(var si=0;si<includeTousseJsonArray.length;++si){
         	var tousseId = includeTousseJsonArray[si].id;
-            var tousseName = includeTousseJsonArray[si].tousseName;
+			var tousseName = includeTousseJsonArray[si].tousseName;
+			var tousseAmount = includeTousseJsonArray[si].tousseAmount;
             var amount = includeTousseJsonArray[si].amount;
             var item = defAmount[tousseId];
             if(isUndefinedOrNull(item)){
             	item = {
             		id:	tousseId,
             		tousseName: tousseName,
-            		amount: 0,
+					amount: 0,
+					tousseAmount:tousseAmount,
             		packageType: includeTousseJsonArray[si].packageType
             	}
             	defAmount[tousseId] = item;
@@ -1608,7 +1619,7 @@
 						errorAmount : 0,
 						damageAmount : 0,
 						unWashAmount : 0,
-						tousseAmount : 0
+						tousseAmount : item.tousseAmount,
 					}]
 					waitComboTousseGridStore.insert(0,addItem);
 					continue;