Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31274 -r31285
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31274)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31285)
@@ -1657,10 +1657,6 @@
         id : 'packedPhotographed',
         name : 'packedPhotographed'
     },{
-        xtype : 'hidden',
-        id : 'hiddenMessage',
-        name : 'hiddenMessage'
-    },{
 		columnWidth : .5,
 		hidden : sstsConfig.disableIdCard,
 		xtype : 'textfield',
@@ -3354,11 +3350,6 @@
 
 // 验证参数
 function validateFormParamsForPack(){
-	if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && Ext4.getCmp('packedPhotographed').getValue() == 'false'){
-		var msg = Ext4.getCmp('hiddenMessage').getValue();
-        showResult(msg, null , sstsConfig.messagePauseTimeOnPackingPage);
-        return false;
-	}
 	if(!Ext4.getCmp('operator').getValue()){
         showResult("请扫描装配人条码！" , null , sstsConfig.messagePauseTimeOnPackingPage);
         return false;
@@ -3594,7 +3585,6 @@
 		packingToussesArray = []; // 清除所装配的器械包数组
 		packedToussesArray = [];
 		tousseesToPrint = [];
-		Ext4.getCmp('packedPhotographed').setValue('');
 	}
 	// 备注不为空时只能装配一个包实例
 	if(!validateRemark()){
@@ -3653,8 +3643,11 @@
 			}
 		}
 		var params = [];
-		var packedPhotographed = true;
-		var msg = '';
+		var packedPhotographed1 = true;
+		var packedPhotographed2 = true;
+		var msg1Array = [];
+		var msg2Array = [];
+		var packageArray = [];
 		for(var i=0;i<dest.length;i++){
 			var pNode = dest[i];
 			var pTousseName = pNode.get('tousseName');
@@ -3705,12 +3698,16 @@
 					if(cNode.data.tousseType == '外来器械包'){
 						for(var k=0;k<cNode.childNodes.length;k++){
 							if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking){
-								packedPhotographed = false;
-								msg = cNode.childNodes[k].data.tousseName+'已经做了拆包，请点击拆包进入完成操作!';
+								packedPhotographed1 = false;
+								if(msg1Array.indexOf(cNode.childNodes[k].data.tousseName) == -1){
+									msg1Array.push(cNode.childNodes[k].data.tousseName);
+								}
 							}
 							if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed){
-								packedPhotographed = false;
-								msg = cNode.childNodes[k].data.tousseName+'还未上传照片，不能装配，请先上传照片!';
+								packedPhotographed2 = false;
+								if(msg2Array.indexOf(cNode.childNodes[k].data.tousseName) == -1){
+									msg2Array.push(cNode.childNodes[k].data.tousseName);
+								}
 							}
 						}
 					}
@@ -3735,14 +3732,18 @@
 					department = cNode.get("department");
 					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包'){
 						if(cNode.get("partPacking")){
-							msg = cNode.get("tousseName") +'已经做了拆包，请点击拆包进入完成操作!';
-							packedPhotographed = false;
+							packedPhotographed1 = false;
+							if(msg1Array.indexOf(cNode.get("tousseName")) == -1){
+								msg1Array.push(cNode.get("tousseName"));
+							}
 						}
 					}
 					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包'){
 						if(cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false){
-							msg = cNode.get("tousseName") +'还未上传照片，不能装配，请先上传照片!';
-							packedPhotographed = false;
+							packedPhotographed2 = false;
+							if(msg2Array.indexOf(cNode.get("tousseName")) == -1){
+								msg2Array.push(cNode.get("tousseName"));
+							}
 						}
 					}
 					if(status == '待确认'){
@@ -3817,19 +3818,59 @@
 			}else {
 				lastAmount = parentAmout;
 			}
-			Ext4.getCmp('packedPhotographed').setValue(packedPhotographed);
-			Ext4.getCmp('hiddenMessage').setValue(msg);
-			//请求后台装配方法
-			var par = packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,lastAmount,packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'),JSON.stringify(taskIdDest),noUserFormSterilizationInfo);
-			if(par !== false){
-				params.push(par);
-			}
+			packageArray.push({
+				printImmediately:false,
+				basketBarcode:basketBarcode,
+				scannedBasketBarcodes:scannedBasketBarcodes.join(";"),
+				taskIds:taskIdArray.join(";"),
+				tousseName:tousseName,
+				tousseType:tousseType,
+				packAmount:lastAmount,
+				packageType:packageType,
+				sterilingType:sterilingType,
+				supplierName:supplierName,
+				department:departmentArray.join(";"),
+				urgentAmount:pNode.get('urgentAmount'),
+				taskIdToAmountMapInfo:JSON.stringify(taskIdDest),
+				noUserFormSterilizationInfo:noUserFormSterilizationInfo
+			});
 		}
-		if(!packedPhotographed){
+		if(!packedPhotographed1){
 			hidePackingTousseBtnClick_mask();
 			Ext4.getCmp('save_print').enable();
+			showResult(msg1Array.join(",")+'已经做了拆包，请点击拆包进入完成操作!');
 			return;
 		}
+		if(!packedPhotographed2){
+			hidePackingTousseBtnClick_mask();
+			Ext4.getCmp('save_print').enable();
+			showResult(msg2Array.join(",")+'还未上传照片，不能装配，请先上传照片!');
+			return;
+		}
+		if(packageArray.length > 0){
+			for(var i=0;i<packageArray.length;i++){
+				var printImmediately = packageArray[i].printImmediately;
+				var basketBarcode = packageArray[i].basketBarcode;
+				var scannedBasketBarcodes = packageArray[i].scannedBasketBarcodes;
+				var taskIds = packageArray[i].taskIds;
+				var tousseName = packageArray[i].tousseName;
+				var tousseType = packageArray[i].tousseType;
+				var packAmount = packageArray[i].packAmount;
+				var packageType = packageArray[i].packageType;
+				var sterilingType = packageArray[i].sterilingType;
+				var supplierName = packageArray[i].supplierName;
+				var department = packageArray[i].department;
+				var urgentAmount = packageArray[i].urgentAmount;
+				var taskIdToAmountMapInfo = packageArray[i].taskIdToAmountMapInfo;
+				var noUserFormSterilizationInfo = packageArray[i].noUserFormSterilizationInfo;
+				//请求后台装配方法
+				var par = packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,
+					sterilingType,supplierName,department,urgentAmount,taskIdToAmountMapInfo,noUserFormSterilizationInfo);
+				if(par !== false){
+					params.push(par);
+				}
+			}
+		}
 		isConfirmRequestPackingTousse(params,0,true);
 	 }else{
 		//不回收的物品