Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r37857 -r37873
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 37857)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 37873)
@@ -102,12 +102,12 @@
 		return addZero(parseInt(v.month, 10) + 1) + "-" + addZero(v.date) + " " + addZero(v.hours) + ":" + addZero(v.minutes);
 	}
 }
-function recycleTheApplication(id, barcode, cleanBasketBarcodes, foreignTousseInvoicedAndNoUse, tiStatus) {
+function recycleTheApplication(id, barcode, cleanBasketBarcodes) {
 	var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser");
 	if(cleanBasketBarcodes){
-		location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&cleanBasketBarcodes=' + cleanBasketBarcodes + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse  + '&tiStatus=' + encodeURIComponent(tiStatus || '');
+		location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&cleanBasketBarcodes=' + cleanBasketBarcodes;
 	}else {
-		location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse + '&tiStatus=' + encodeURIComponent(tiStatus || '');
+		location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source;
 	}
 	
 }
@@ -952,7 +952,7 @@
 						if(msg.cleanBasketBarcodes && msg.cleanBasketBarcodes.length > 0){
 							cleanBasketBarcodes = msg.cleanBasketBarcodes.join(';');
 						}
-						recycleTheApplication(id, barcode, cleanBasketBarcodes, msg.foreignTousseInvoicedAndNoUse, msg.tiStatus);
+						recycleTheApplication(id, barcode, cleanBasketBarcodes);
 					} else if (msg.departMent != "" && msg.orgUnitCoding != "") {
 						var id = $("#inputselect").val();
 						var appType = $("#appTypeSelect").val();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r37857 -r37873
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 37857)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 37873)
@@ -237,9 +237,6 @@
 var secondOrgUnitName = '<%=request.getAttribute("orgUnitName")%>';
 var fromLogin = '${fromLogin}';
 var cleanBasketBarcodes = '${param.cleanBasketBarcodes}';
-var foreignTousseInvoicedAndNoUse = '${param.foreignTousseInvoicedAndNoUse}';
-var tiStatus = '${param.tiStatus}';
-tiStatus = decodeURIComponent(tiStatus);
 if(fromLogin == 'true'){
 	welcome(departName,userName);
 	<%session.removeAttribute("fromLogin");%>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37857 -r37873
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37857)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37873)
@@ -25,6 +25,8 @@
 // 可以终止的TousseItem的id.已经回收但是还没有发货的话，也是可以终止的。目前部分发货不能终止
 var canTerminateTousseItemIds = [];
 var lastTousseNames = '';
+// ZSYY-335：保存提示
+var foreignTousseInvoicedAndNoUseInfo = [];
 //缓存标识牌条码
 var sessionIDCardBarcodes = new newMap();
 // 是否开启根据科室加载模板
@@ -2591,6 +2593,23 @@
 	});
 }
 
+//SZSDSRMYY-128：显示对应物品的所有已回收物品的回收时间
+// function openRecyclingTimeList(row){
+// 	$("#recycleTimeList").dialog({
+// 		resizable: false,
+// 		height: 530,
+// 		width: 800,
+// 		title: '回收时间列表',
+// 		modal: true,
+// 		open: function () {
+// 			$("#recycleTimeListBox").show()
+// 		},
+// 		close: function () {
+// 			//$("#confirmMsg").html("");
+// 		}
+// 	});
+// }
+
 // 打开器械包加急的窗口
 function openSetUrgentAmountPage(row, packed) {
 	if (packed) {
@@ -3270,7 +3289,7 @@
 	var recyclingApplicationId = $('#recyclingApplicationId').val();
 	var materials = $('#materials' + row).val();
 	DWREngine.setAsync(false);
-	RecyclingRecordTableManager.getTousseIntoBasketAmount(materials, tousseDefinitionID, recycleAmount, idCardBarcode, JSON.stringify(params), JSON.stringify(getTousseIntoBasketInfo()), recyclingApplicationId, foreignTousseInvoicedAndNoUse, function (result) {
+	RecyclingRecordTableManager.getTousseIntoBasketAmount(materials, tousseDefinitionID, recycleAmount, idCardBarcode, JSON.stringify(params), JSON.stringify(getTousseIntoBasketInfo()), recyclingApplicationId, function (result) {
 		var jsonObj = JSON.parse(result);
 		if (!jsonObj.success) {
 			alertDiv(jsonObj.message);
@@ -3295,6 +3314,8 @@
 					}
 				}
 			}
+			var arr = jsonObj.foreignTousseInvoicedAndNoUseInfo || [];
+			foreignTousseInvoicedAndNoUseInfo = foreignTousseInvoicedAndNoUseInfo.concat(arr);
 			if (!sstsConfig.allowDecreaseRecyclingAmountGreatUnPackingAmount) {
 				if (recycleAmountNew < maxCount) {
 					alertDiv(tousseName + "已装配" + packAmount + "个，已发货" + invoiceAmount + "个，修改后回收的数量为" + recycleAmountNew + "，不能小于已装配或者已发货的数量！");
@@ -4267,6 +4288,7 @@
 			'<td><a href="javascript:void(0);" id="recyclingErrorButton' + row + '" class="btn-b" onclick="openRecyclingErrorPage(' + row + ',\'' + errorDamageQmKey + '\');">丢失</a></td>' +
 			'<td><a href="javascript:void(0);" id="recyclingDamageButton' + row + '" class="btn-c" onclick="openRecyclingDamagePage(' + row + ',\'' + encodeAll(tousseName) + '\',\'' + tousseItemId + '\',\'' + errorDamageQmKey + '\');">报损</a></td>' +
 			'<td><a href="javascript:void(0);" class="btn-d" onclick="deleteConfirm(\'是否要删除器械包【' + tousseName + '】？\',\'deleteTousse\',' + row + ',\'\',\'\',\'\');">删除</a></td></tr>';
+		//trStr += '<tr id="recycleTimeTr' + row + '" class="recycleTimeTr"><td>&nbsp;</td><td colspan=10><div class="recycleTime" id="recycleTime' + row + '">上次回收时间：2023-02-02 23：15 <span onclick="openRecyclingTimeList(' + row + ');">查看详细</span></div></td></tr>';
 		trStr += '<tr id="errorMaterialsTr' + row + '" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorMaterials' + row + '"></div></td></tr>';
 		trStr += '<tr id="errorRemarkTr' + row + '" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorRemark' + row + '"></div></td></tr>';
 		trStr += '<tr id="damageMaterialsTr' + row + '" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="damageMaterials' + row + '"></div></td></tr>';
@@ -4974,9 +4996,17 @@
 		}, 800, 500);
 	} else {
 		//ZSYY-335：外来器械发货后可以二次回收
-		if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction && foreignTousseInvoicedAndNoUse == 'true'){
-			dialogConfirm(lastTousseNames+"("+params_barcode+")为"+tiStatus+"状态，是否直接进行二次回收？", function () {
-				submitFormFunction(confirmation, saveAndNew, false, print, recyclingAmountConfirm,false, '否', foreignTousseInvoicedAndNoUse);
+		if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction && foreignTousseInvoicedAndNoUseInfo.length > 0){
+			var html = '';
+			for(var i=0;i<foreignTousseInvoicedAndNoUseInfo.length;i++){
+				var name = foreignTousseInvoicedAndNoUseInfo[i].tousseName;
+				var barcode = foreignTousseInvoicedAndNoUseInfo[i].barcode;
+				var status = foreignTousseInvoicedAndNoUseInfo[i].status;
+				html += name+"("+barcode+")为"+status+"状态，"
+			}
+
+			dialogConfirm(html + "是否直接进行二次回收？", function () {
+				submitFormFunction(confirmation, saveAndNew, false, print, recyclingAmountConfirm,false, '否');
 			});
 		}else {
 			submitFormFunction(confirmation, saveAndNew, false, print, recyclingAmountConfirm);
@@ -5148,12 +5178,11 @@
  * @param saveAndNew					保存并新建回收记录操作
  * @param autoReturnTheBorrowingTousse	自动归还借物单
  * @param print							保存并打印回收记录操作
- * @param foreignTousseInvoicedAndNoUse	true表示外来器械发货后可以二次回收
  * Annie   如果tally为true是清点确认 否则就是false
  */
 //是否进行清点确认 false 为保存，true 为清点确认
 var IntheBoxState = false;
-function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm, continueRecycleItemsthatLessThanSendAmount, foreignTousseInvoicedAndNoUse) {
+function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm, continueRecycleItemsthatLessThanSendAmount) {
 	isConfirm = isConfirm || false;
 	var basketSize = getBasketSizeObject('array');
 	if (typeof basketSize == 'string') {
@@ -5217,7 +5246,6 @@
 			communicationUserName: $('#communicationUserName').val(),
 			communicationUserCode: $('#communicationUserCode').val(),
 			continueRecycleItemsthatLessThanSendAmount:continueRecycleItemsthatLessThanSendAmount || '否',
-			foreignTousseInvoicedAndNoUse:foreignTousseInvoicedAndNoUse || '',
 			needPrint: print
 		},
 		success: function (result) {
@@ -6677,7 +6705,7 @@
 	var recyclingStatus = null;
 	if (!isUndefinedOrNullOrEmpty(recyclingApplicationId)) {
 		DWREngine.setAsync(false);
-		RecyclingApplicationTableManager.getRecyclingApplicationForRecycle(recyclingApplicationId,foreignTousseInvoicedAndNoUse, function (application) {
+		RecyclingApplicationTableManager.getRecyclingApplicationForRecycle(recyclingApplicationId, function (application) {
 			if (application == null)
 				return;
 			recyclingStatus = application.recyclingStatus;
@@ -6742,7 +6770,7 @@
 						len++;
 					}
 				});
-				if (application.applicationItems != null && foreignTousseInvoicedAndNoUse == 'true') {
+				if (application.applicationItems != null) {
 					var row = len;
 					canTerminateTousseItemIds = [];
 					
@@ -7520,6 +7548,10 @@
 				}
 			}
 			$('.btn-box').css('display', 'block');
+			//SZSDSRMYY-128：显示回收时间
+			// if(sstsConfig.enableDisplayRecyclingTimeOfrecyclingRecordList){
+			// 	$('.recycleTimeTr').show();
+			// }
 		}
 		$('#tousseItemTable').children().first().children().each(function (i, element) {
 			var tousseDefinitionID = $('#tousseDefinitionID' + i).val();