Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24390 -r24392
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24390)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24392)
@@ -14,6 +14,101 @@
 }
 
 $("#packPrint").click(function(){
+	// 开始构造参数循环调用装配方法
+	  var table = $("#assemblyTaskleftFootTable");
+	  var selections = table.bootstrapTable('getSelections');
+	  if(selections == null || selections.length == 0){
+		  return ;
+	  }
+	  for(var tousseIndex=0;tousseIndex<selections.length;++tousseIndex){
+		  var tousseNode = selections[tousseIndex];
+			 var pTousseName = tousseNode.tousseName;
+			 var haveIDCard = tousseNode.haveIDCard;
+			 // 跳过有标识牌的器械包
+			 if(haveIDCard){
+				 continue;
+			 }
+			 //器械包装配数量
+			 var packingAmount = tousseNode.amount;
+			 if(packingAmount <= 0){
+			    	continue;
+			 }
+			 
+        
+        var taskIdArray = [];
+        var scannedBasketBarcodes = [];
+        var basketBarcode;
+        var tousseName;
+        var tousseType;
+        var packageType;
+        var sterilingType;
+        var supplierName;
+        var damages;
+        var errors;
+        var department;
+        var departmentArray = [];
+        var status;
+        //遍历器械包下的每条装配任务数据
+        var children = tousseNode.children;
+        for(var taskIndex=0;taskIndex<children.length;++taskIndex){
+      	  var task = children[taskIndex];
+				tousseName = task.tousseName;
+				status = task.status;
+				basketBarcode = task.basketBarcode;
+            	var taskId = task。taskId;
+            	
+            	var amount = task.amount;
+            	if(amount > packingAmount){
+            		amount = packingAmount;
+            	}
+            	packageType = task.packageType;
+//            	if(useManualSelectPackageType()){
+//            		packageType = Ext4.getCmp('packageType').getValue();
+//            	}
+            	sterilingType = task.sterilingMethod;
+//            	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
+//            		sterilingType = Ext4.getCmp('sterilingType').getValue();
+//            	}
+            	tousseType = task.tousseType;
+            	supplierName = task.supplierName;
+            	damages = task.damages;
+            	errors = task.errors;
+            	department = task.department;
+            	departmentArray.push(department);
+            	
+            	if(status == '待确认'){
+					showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+					return;
+				}
+            	
+            	if(!allowPackingWhenUnSupplementMaterial){
+            		if(errors != null && errors.length > 0){
+                		showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+                       return;
+                   }
+                   if(damages != null && damages.length > 0){
+                   	showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+                       return;
+                   }
+            	}
+               
+               if(packingAmount > 0){
+               	taskIdArray.push(taskId);
+               	scannedBasketBarcodes.push(basketBarcode);
+               	packingAmount -= amount;
+               	
+               }
+			 };
+			 if(packingAmount > 0){
+				 showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和." , null , sstsConfig.messagePauseTimeOnPackingPage);
+				 delBasketItems.splice(dl,1);//删除
+				 return;
+			 }
+			 alert(taskIdArray.join(";"))
+			 //请求后台装配方法
+//			 packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
+		}
+	  
 	/*var taskPar = $("#dataPar_index"+0).data('taskPar');
 	
 	var taskChild = $("#"+getIndexPar+"datachild_index"+0).data('taskChild');