Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r16968 -r19425
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 16968)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 19425)
@@ -1,4 +1,10 @@
 /**
+ * 是否继续装配
+ */
+var continuePacking = false;
+var packing = false;
+var waitAmount = {};
+/**
  * 聚合包装配界面
  */
 
@@ -202,10 +208,12 @@
     
     var comboTousseDataGridStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
     
+    
     if(tousseDetail != ""){
         var item = [{
         	comboId : id,
             tousseName : tousseName,
+            amount: 1,
             includeTousseDetail : tousseDetail,
             includeTousseJsonArray : tousseJsonArray,
             packageType : type
@@ -230,6 +238,7 @@
         var tousse = {};
         tousse.id = record.get('comboId');
         tousse.tousseName = record.get('tousseName');
+        tousse.amount = record.get('amount');
         tousse.includeTousseDetail = record.get('includeTousseDetail');
         tousse.includeTousseJsonArray = record.get('includeTousseJsonArray');
         tousse.packageType = record.get('packageType');
@@ -358,6 +367,7 @@
 		minChars : 0,
 		valueField : 'id',
 		displayField : 'name',
+		queryParam : 'spell',
 		width : 180,
 		store : comboTousseStore,
 		forceSelection : true,
@@ -366,7 +376,7 @@
 		hideTrigger : false,
 		typeAhead : false,
 		allowBlank : true,
-		editable:false,
+//		editable:false,
 		listeners : {
 			select : function(combo, records, index) {
 				
@@ -420,6 +430,10 @@
 									unWashAmount : unWashAmount
 								}]
 								waitComboTousseStore.insert(0,addItem);
+								waitAmount[id] = {
+										name: name,
+										amount: amount
+								};
 							}
 						},
 						failure : function(response, options) {
@@ -525,6 +539,7 @@
         	fields : [
         	    {name : 'comboId',mapping : 'comboId'},
         	    {name : 'tousseName',mapping : 'tousseName'}, 
+        	    {name : 'amount',mapping : 'amount'},
         	    {name : 'packageType',mapping : 'packageType'}, 
         	    {name : 'includeTousseDetail',mapping : 'includeTousseDetail'}, 
         	    {name : 'includeTousseJsonArray',mapping : 'includeTousseJsonArray'}
@@ -535,7 +550,22 @@
 	        dataIndex : 'tousseName',
 	        sortable:false,
 	        width : 280
-	    },{
+	    }, {
+            header : "数量",
+            dataIndex : 'amount',
+            width : 70,
+            editor : {
+            	xtype: 'numberfield',
+            	allowDecimals : false,
+            	minValue : 1,
+                allowBlank: false,
+                listeners:{
+                	focus : function(thiz){
+						thiz.selectText();
+					}
+                }
+            }
+        },{
 	        header : "包装类型",
 	        dataIndex : 'packageType',
 	        width : 170,
@@ -771,126 +801,15 @@
         buttons : [{
             text : packingBtnText,
             handler : function() {
-            	if (!packingComboToussePanel.form.isValid()) {
-                    showResult('请正确填写表单各值');
-                    this.enable();
-                    return false;
-                }
-            	
-            	packingToussesArray = []; // 清除所装配的器械包数组
-            	
-            	var comboTousseStore = top.Ext4.getCmp("comboGrid").getStore();
-            	
-                v = comboTousseStore.getCount();
-                if(v > 0){
-                     showResult("还有部分器械包未确认！");
-                     return false;
-                }
-                
-                top.Ext4.getCmp('taskGroup3').setValue(taskGroup);
-                
-                var reviewer = top.Ext4.getCmp('reviewer3');
-                if(reviewer.isVisible() && !reviewer.getValue()){
-                    showResult("请扫描审核人条码！");
-                    return false;
-                }
-                var comboTousseDataStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
-                var isHaveEmptyPackingType = false;
-                for ( var i = 0; i < comboTousseDataStore.getCount(); i++) {
-                   var record = comboTousseDataStore.getAt(i);
-                   var packageType = record.get("packageType");
-                   if(packageType == ""){
-                	   isHaveEmptyPackingType = true;
-                	   break;
-                   }
-                }
-                if(isHaveEmptyPackingType){
-                	showResult("有聚合包未设置包装类型！");
-                	return false;
-                }
-                
-                if(!getComboTousseData()){
-                	showResult("装配物品不能为空！");
-                    return false;
-                }
-                
-                
-                operator = top.Ext4.getCmp('operator3').getValue();
-                operatorCode = top.Ext4.getCmp('operatorCode3').getValue();
-                reviewer = top.Ext4.getCmp('reviewer3').getValue();
-                reviewerCode = top.Ext4.getCmp('reviewerCode3').getValue();
-                sterileUserName = top.Ext4.getCmp('sterileUser3').getValue();
-                sterileUserCode = top.Ext4.getCmp('sterileCode3').getValue();
-                
-                var sterilingType = top.Ext4.getCmp('sterilingType3').getValue();
-                var comboPackages =  top.Ext4.getCmp('comboPackages').getValue();
-                var sterilizer = top.Ext4.getCmp("sterilizer3").getValue();
-                var frequency = top.Ext4.getCmp("frequency3").getValue();
-
-                var sterileDate = top.Ext4.getCmp('sterileDate3').getValue();
-                if(isUndefinedOrNullOrEmpty(sterileDate)){
-                	sterileDate = new Date();
-                }
-                
-                var params = {
-                		operator: operator,
-                		operatorCode: operatorCode,
-                		reviewer: reviewer,
-                		reviewerCode: reviewerCode,
-                		sterileUserName : sterileUserName,
-                		sterileUserCode : sterileUserCode,
-                		sterilingType: sterilingType,
-                		sterileDate: sterileDate.getTime(),
-                		packAmount: 1,
-                		taskGroup: taskGroup,
-                		comboTousseJsonArray: comboPackages,
-            			sterilizer: sterilizer,
-            			frequency: frequency
-            	}
-                DWREngine.setAsync(false);
-                PackingTableManager.packingComboTousse(JSON.stringify(params),function(rs){
-                	if (rs != null){
-                		var result = Ext.decode(rs);
-                		if (result.success){
-                			
-                			var tousses = result.tousses;
-                			
-                			packingToussesArray = packingToussesArray.concat(tousses);
-                			
-                			// 审核时打印标签
-                			if (sstsConfig.printLabelWhenReviewing == true){
-                				showResult("装配完成");
-                			}
-                			// 装配时打印标签
-                			else{
-                				var printAmount = tousses[0].printAmount;
-                				for(var pi=0;pi<printAmount;++pi){// 支持多份打印
-                					for (var i=0;i<tousses.length;i++){
-                    					var tousseObj = tousses[i];
-                    					
-                    					// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
-                    					top.Ext4.MessageBox.progress('打印中', '请稍候...');
-                    					top.Ext4.MessageBox.updateProgress((pi*tousses.length+i + 1)/(printAmount*tousses.length),'第'+ (pi+1)+ '次打印,共'+printAmount+'次，第'+(i + 1) + '个包,共' + tousses.length +  '个包');
-                    					
-                    					printLabel(tousseObj);
-                	                    
-                    				}
-                				}
-                				hideMessageBox4(true);
-                				
-                			}
-    	                    Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
-    	                    Ext4.getCmp('basketTreeGrid').getStore().reload();
-    	                    
-    	                    top.Ext4.getCmp("comboTousseWin").close();
-                		}
-                		else{
-                			showResult(result.message);
-                		}
-                	}
-                });
-                DWREngine.setAsync(true);
+            	continuePacking = false;
+            	onPackingBtnClick(this);
             }
+        },{
+            text : '装配并继续',
+            handler : function() {
+            	continuePacking = true;
+            	onPackingBtnClick(this);
+            }
         }]
     });
     
@@ -988,4 +907,182 @@
     	reviewerBarcode3.disable();
     	reviewerBarcode3.hide();
     }
+    
+    // 装配按钮处理
+    function onPackingBtnClick(btn){
+
+    	if (!packingComboToussePanel.form.isValid()) {
+            showResult('请正确填写表单各值');
+            btn.enable();
+            return false;
+        }
+    	
+    	packingToussesArray = []; // 清除所装配的器械包数组
+    	
+    	var comboTousseStore = top.Ext4.getCmp("comboGrid").getStore();
+    	
+        v = comboTousseStore.getCount();
+        if(v > 0){
+             showResult("还有部分器械包未确认！");
+             return false;
+        }
+        
+        top.Ext4.getCmp('taskGroup3').setValue(taskGroup);
+        
+        var reviewer = top.Ext4.getCmp('reviewer3');
+        if(reviewer.isVisible() && !reviewer.getValue()){
+            showResult("请扫描审核人条码！");
+            return false;
+        }
+        var comboTousseDataStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+        var isHaveEmptyPackingType = false;
+        for ( var i = 0; i < comboTousseDataStore.getCount(); i++) {
+           var record = comboTousseDataStore.getAt(i);
+           var packageType = record.get("packageType");
+           if(packageType == ""){
+        	   isHaveEmptyPackingType = true;
+        	   break;
+           }
+        }
+        if(isHaveEmptyPackingType){
+        	showResult("有聚合包未设置包装类型！");
+        	return false;
+        }
+        
+        if(!getComboTousseData()){
+        	showResult("装配物品不能为空！");
+            return false;
+        }
+        
+        
+        operator = top.Ext4.getCmp('operator3').getValue();
+        operatorCode = top.Ext4.getCmp('operatorCode3').getValue();
+        reviewer = top.Ext4.getCmp('reviewer3').getValue();
+        reviewerCode = top.Ext4.getCmp('reviewerCode3').getValue();
+        sterileUserName = top.Ext4.getCmp('sterileUser3').getValue();
+        sterileUserCode = top.Ext4.getCmp('sterileCode3').getValue();
+        
+        var sterilingType = top.Ext4.getCmp('sterilingType3').getValue();
+        var comboPackages =  top.Ext4.getCmp('comboPackages').getValue();
+        var sterilizer = top.Ext4.getCmp("sterilizer3").getValue();
+        var frequency = top.Ext4.getCmp("frequency3").getValue();
+
+        var sterileDate = top.Ext4.getCmp('sterileDate3').getValue();
+        if(isUndefinedOrNullOrEmpty(sterileDate)){
+        	sterileDate = new Date();
+        }
+        // 校验数量是否有效
+        if(!isAmountSufficient()){
+        	return false;
+        }
+        var params = {
+        		operator: operator,
+        		operatorCode: operatorCode,
+        		reviewer: reviewer,
+        		reviewerCode: reviewerCode,
+        		sterileUserName : sterileUserName,
+        		sterileUserCode : sterileUserCode,
+        		sterilingType: sterilingType,
+        		sterileDate: sterileDate.getTime(),
+        		packAmount: 1,
+        		taskGroup: taskGroup,
+        		comboTousseJsonArray: comboPackages,
+    			sterilizer: sterilizer,
+    			frequency: frequency
+    	}
+        DWREngine.setAsync(false);
+        PackingTableManager.packingComboTousse(JSON.stringify(params),function(rs){
+        	if (rs != null){
+        		var result = Ext.decode(rs);
+        		if (result.success){
+        			
+        			var tousses = result.tousses;
+        			
+        			packingToussesArray = packingToussesArray.concat(tousses);
+        			
+        			// 审核时打印标签
+        			if (sstsConfig.printLabelWhenReviewing == true){
+        				showResult("装配完成");
+        			}
+        			// 装配时打印标签
+        			else{
+        				var printAmount = tousses[0].printAmount;
+        				for(var pi=0;pi<printAmount;++pi){// 支持多份打印
+        					for (var i=0;i<tousses.length;i++){
+            					var tousseObj = tousses[i];
+            					
+            					// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
+            					top.Ext4.MessageBox.progress('打印中', '请稍候...');
+            					top.Ext4.MessageBox.updateProgress((pi*tousses.length+i + 1)/(printAmount*tousses.length),'第'+ (pi+1)+ '次打印,共'+printAmount+'次，第'+(i + 1) + '个包,共' + tousses.length +  '个包');
+            					
+            					printLabel(tousseObj);
+        	                    
+            				}
+        				}
+        				hideMessageBox4(true);
+        				
+        			}
+        			if(!continuePacking){
+        				Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
+                        Ext4.getCmp('basketTreeGrid').getStore().reload();
+                        
+                        top.Ext4.getCmp("comboTousseWin").close();
+        			}else{
+        				clearComboTousseDataGrid();
+        			}
+        		}
+        		else{
+        			showResult(result.message);
+        		}
+        	}
+        });
+        DWREngine.setAsync(true);
+    }
+    
+    function clearComboTousseDataGrid(){
+    	var comboTousseDataGridStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+		comboTousseDataGridStore.removeAll();
+    }
+    // 数量是否足够
+    function isAmountSufficient(){
+    	var comboTousseDataStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+		var submitAmount = {};
+		for (var i = 0; i < comboTousseDataStore.getCount(); i++) {
+	        var record = comboTousseDataStore.getAt(i);
+//	        var id = record.get('comboId');
+	        var comboAmount = record.get('amount');
+	        var includeTousseJsonArray = record.get('includeTousseJsonArray');
+	        for(var si=0;si<includeTousseJsonArray.length;++si){
+	        	var tousseId = includeTousseJsonArray[si].id;
+	            var tousseName = includeTousseJsonArray[si].tousseName;
+	            var amount = includeTousseJsonArray[si].amount;
+	            var item = submitAmount[tousseId];
+	            if(isUndefinedOrNull(item)){
+	            	item = {
+	            		id:	tousseId,
+	            		tousseName: tousseName,
+	            		amount: 0
+	            	}
+	            	submitAmount[tousseId] = item;
+	            }
+	            item.amount += comboAmount*amount;
+	        }
+	    }
+		for(var id in submitAmount ){
+			if(submitAmount.hasOwnProperty(id)){
+				var item = submitAmount[id];
+				var tousseName = item.tousseName;
+				var waitItem = waitAmount[id];
+				if(isUndefinedOrNull(waitItem)){
+					showResult(tousseName+' 超过数量!');
+		        	return false;
+				}
+				if(item.amount > waitItem.amount){
+					showResult(tousseName+' 超过数量!');
+		        	return false;
+				}
+			}
+		}
+		return true;
+    }
 }