Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37798 -r37800
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37798)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37800)
@@ -4789,8 +4789,8 @@
 				destIndex = destIndex || 0;
 				if (dest.length > 0) {
 					if (destIndex < dest.length) {
+						var tousseID = dest[destIndex].data.tousseID;
 						if(sstsConfig.showConfirmDialogWhenDirectPackingTousseInsideComboTousse){
-							var tousseID = dest[destIndex].data.tousseID;
 							Ext4.Ajax.request({
 								url: WWWROOT + '/disinfectSystem/packingAction!verifyTousseCanBeAggregated.do',
 								params: {
@@ -4829,11 +4829,14 @@
 									return
 								}
 							});
-							return
 						}else {
 							destIndex++
 							packingTousseBtnClick_DeferredExecution('是', destIndex)
 						}
+						return
+					}else {
+						onPackingTousseBtnClickComplete();
+						return;
 					}
 				} else {
 					onPackingTousseBtnClickComplete();
@@ -5159,46 +5162,54 @@
 					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);
+							if(sstsConfig.showConfirmDialogWhenDirectPackingTousseInsideComboTousse){
+								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)
 													}
-													packingTousseBtnClick_DeferredExecution('是', destIndex)
-												}
-											});
-										} else {
-											destIndex++
-											packingTousseBtnClick_DeferredExecution('是', destIndex)
+												});
+											} else {
+												destIndex++
+												packingTousseBtnClick_DeferredExecution('是', destIndex)
+											}
 										}
+									},
+									failure: function () {
+										onPackingTousseBtnClickComplete();
+										return
 									}
-								},
-								failure: function () {
-									onPackingTousseBtnClickComplete();
-									return
-								}
-							});
+								});
+							}else {
+								destIndex++
+								packingTousseBtnClick_DeferredExecution('是', destIndex)
+							}
 							return
+						}else {
+							onPackingTousseBtnClickComplete();
+							return
 						}
 					} else {
 						onPackingTousseBtnClickComplete();