Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r40758 -r40768
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 40758)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 40768)
@@ -683,7 +683,6 @@
 		var row = $('#pageRow').val();
 		var recycleAmountNew = $('#pageRecycleAmountNew').val();
 		putTousseInTheBasket(row, recycleAmountNew);
-		lock = false;
 	};
 
 	ab.center = true;
@@ -4438,6 +4437,7 @@
 		if (amount == 0) {
 			alertDiv('没有可以放入篮筐的器械包。');
 		} else {
+			//DGSETYY-116：弹出清洗指引
 			if (sstsConfig.enableCleaningInstructionsAlertRequiredWhenRecycling && !lock) {
 				var videoCount = 0;
 				var imgCount = 0;
@@ -4486,18 +4486,18 @@
 					$('#imgAndVideoType').val('video');
 					alertWashGuideImgOrVideo();
 					$('#videoAndImgBtn').show();
-					return
+					return false
 				} else if (videoCount > 0 && imgCount == 0) {
 					$('#pageAmount').val(videoCount);
 					$('#videoIds').val(videoIds);
 					$('#imgAndVideoType').val('video');
 					alertWashGuideImgOrVideo();
-					return
+					return false
 				} else if (videoCount == 0 && imgCount > 0) {
 					$('#pageAmount').val(imgCount);
 					$('#imgAndVideoType').val('img');
 					alertWashGuideImgOrVideo();
-					return
+					return false
 				}
 			}
 			var idsLen = 0;
@@ -4559,6 +4559,12 @@
 		refreshAllBasketTotalNum();
 		refreshSplitBasketView();
 		tousseItemTableSort();
+		if (sstsConfig.enableCleaningInstructionsAlertRequiredWhenRecycling) {
+			lock = false;
+			if (putTousseRows.length > 0 && putTousseRows[putTousseRows.indexOf(row) + 1]) {
+				isPutTousseInTheBasket(putTousseRows[putTousseRows.indexOf(row) + 1]);
+			}
+		}
 	} else {
 		alertDiv('请先扫描篮筐条码。');
 	}
@@ -6682,19 +6688,36 @@
 	}
 }
 
+var putTousseRows = [];
 // 一键入筐
 function allInputBasket() {
 	// 遍历每一行
-	$('#tousseItemTable').children().first().children().each(function (row, element) {
-		// 判断是否被删除，为0代表没有被删除
-		if ($('#deleted' + row).val() == '0') {
-			var amount = parseInt($('#recycleAmount' + row).val(), 10) - parseInt($('#loadedAmount' + row).val(), 10);
-			if (amount > 0 && $('#tousseItemsTr' + row).css('display') !== 'none') {
-				// 回收数量大于已装载（入筐）数量，则需要入筐
-				isPutTousseInTheBasket(row);
+	if (sstsConfig.enableCleaningInstructionsAlertRequiredWhenRecycling) {
+		putTousseRows = [];
+		$('#tousseItemTable').children().first().children().each(function (row, element) {
+			// 判断是否被删除，为0代表没有被删除
+			if ($('#deleted' + row).val() == '0') {
+				var amount = parseInt($('#recycleAmount' + row).val(), 10) - parseInt($('#loadedAmount' + row).val(), 10);
+				if (amount > 0 && $('#tousseItemsTr' + row).css('display') !== 'none') {
+					// 回收数量大于已装载（入筐）数量，则需要入筐
+					putTousseRows.push('' + row + '');
+				}
 			}
-		}
-	});
+		});
+		lock = false;
+		isPutTousseInTheBasket(putTousseRows[0]);
+	} else {
+		$('#tousseItemTable').children().first().children().each(function (row, element) {
+			// 判断是否被删除，为0代表没有被删除
+			if ($('#deleted' + row).val() == '0') {
+				var amount = parseInt($('#recycleAmount' + row).val(), 10) - parseInt($('#loadedAmount' + row).val(), 10);
+				if (amount > 0 && $('#tousseItemsTr' + row).css('display') !== 'none') {
+					// 回收数量大于已装载（入筐）数量，则需要入筐
+					isPutTousseInTheBasket(row);
+				}
+			}
+		});
+	}
 }
 
 // 取消按钮