Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r35612 -r35708
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 35612)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 35708)
@@ -22,7 +22,6 @@
 var currentIDCardInfo = null;
 var idCardTaskNode = null;
 var pageSize = 20;
-
 var MATERIAL_NAME_IDCARD = "器械包标识牌";
 var packingBtnText = "装配并打印标签";
 if (sstsConfig.printLabelWhenSterilizing == true) {
@@ -2607,13 +2606,13 @@
 								var result = Ext.decode(response.responseText);
 								var rssiValue = 100;
 								var id = '';
-								if(result.success){
-									if(result.data){
+								if (result.success) {
+									if (result.data) {
 										rssiValue = parseInt(result.data.rssiValue);
 										id = result.data.id;
 									}
 								}
-								updateRSSI(rssiValue,id);
+								updateRSSI(rssiValue, id);
 							},
 							failure: function (response, options) {
 								var result = Ext.decode(response.responseText);
@@ -4090,7 +4089,7 @@
 		setTimeout(packingTousseBtnClick_DeferredExecution, 100);
 	}
 	// 装配按钮调用,延迟执行 
-	function packingTousseBtnClick_DeferredExecution(isConfirm) {
+	function packingTousseBtnClick_DeferredExecution(isConfirm, destIndex) {
 		isConfirm = isConfirm || '否';
 		var basketTree = Ext4.getCmp('basketTreeGrid');
 		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
@@ -4129,6 +4128,57 @@
 					}
 				}
 			}
+			if (sstsConfig.enableComboTousse) {
+				destIndex = destIndex || 0;
+				if (dest.length > 0) {
+					if (destIndex < dest.length) {
+						var tousseID = dest[destIndex].data.tousseID;
+						Ext4.Ajax.request({
+							url: WWWROOT + '/disinfectSystem/packingAction!verifyTousseCanBeAggregated.do',
+							params: {
+								tdIds: tousseID
+							},
+							success: function (result) {
+								var res = Ext4.JSON.decode(result.responseText);
+								if (res.success) {
+									if (res.data.length > 0) {
+										Ext4.MessageBox.confirm("请确认", res.data[0].msg, function (btn) {
+											if (btn == 'yes') {
+												destIndex++
+												packingTousseBtnClick_DeferredExecution('是', destIndex)
+											} else {
+												for (var k = 0; k < selNodes.length; k++) {
+													if (selNodes[k].data.tousseID == tousseID) {
+														selNodes[k].set("checked", false);
+														if (selNodes[k].childNodes.length > 0) {
+															for (var z = 0; z < selNodes[k].childNodes.length; z++) {
+																selNodes[k].childNodes[z].set("checked", false);
+															}
+														}
+													}
+												}
+												packingTousseBtnClick_DeferredExecution('是', destIndex)
+											}
+										});
+									} else {
+										destIndex++
+										packingTousseBtnClick_DeferredExecution('是', destIndex)
+									}
+								}
+							},
+							failure: function () {
+								onPackingTousseBtnClickComplete();
+								return
+							}
+						});
+						return
+					}
+				} else {
+					onPackingTousseBtnClickComplete();
+					showMultipleResult('没有可装配的包！');
+					return;
+				}
+			}
 			var params = [];
 			var packedPhotographed1 = true;
 			var packedPhotographed2 = true;
@@ -4815,7 +4865,7 @@
 			// 该物品的器械包定义是否需要打印标签
 			if (isPrint) {
 				var remark = Ext4.getCmp('remark').getValue();
-				for(var i=0;i<tousses.length;++i){
+				for (var i = 0; i < tousses.length; ++i) {
 					tousses[i].remark = remark;
 				}
 				tousseesToPrint = tousseesToPrint.concat(tousses);
@@ -6770,12 +6820,12 @@
 					}
 				}
 				openPort(params, function (value, isData, errorStatus) {
-					if(errorStatus == 'msg6' || errorStatus == 'msg7'){
+					if (errorStatus == 'msg6' || errorStatus == 'msg7') {
 						location.reload();
 						return
 					}
 					if (isData) {
-						if(typeof value == 'string' && value.indexOf('F') > 0){
+						if (typeof value == 'string' && value.indexOf('F') > 0) {
 							value = value.split('F')[0];
 						}
 						loadIdCardByBarcode(value, true, true);