Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r35708 -r35722
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 35708)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 35722)
@@ -4453,6 +4453,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 = [];
 				for (var i = 0; i < dest.length; i++) {
 					var pNode = dest[i];