Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25630 -r25668
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25630)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25668)
@@ -1099,40 +1099,49 @@
             		if(msg.unfinishedPackingTask!=null){
             			showUnfinishedPackingTask(msg);
             		}else{
-						var ids = msg.tousseInstance.id;
-						$("#dialogConfirm").dialog({
-							resizable: false,
-							height:310,
-							width:600,
-							modal: true,
-							open: function() {
-									$("#confirmMsg").text(msg.errorMessage);
-							},
-							close: function() {
-									$("#confirmMsg").text("");
-							},
-							buttons: {
-									"是": function() {
-										$( this ).dialog( "close" );
-										var remark = showSelectTousseDiscardCauseWin();
-										if(remark != undefined && remark != ""){
-											$.ajax({
-												url : WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
-												type : "post",
-												data : {ids : ids,reason:remark},
-												async : false,
-												success : function(res){
-													loadBarcodeDevice(barcodeTemp);
-												}
-											})
-										}
+						if(sstsConfig.isDiscardWithRecovery && sstsConfig.isDiscardWithRecovery == true){
+							var ids = msg.tousseInstance.id;
+							if(msg.errorType && msg.errorType != undefined && msg.errorType != null && msg.tousseInstance.status != "已废弃"){
+								$("#dialogConfirm").dialog({
+									resizable: false,
+									height:310,
+									width:600,
+									modal: true,
+									open: function() {
+											$("#confirmMsg").text(msg.errorMessage + "  是否重新回收并且废弃上一次记录状态?");
 									},
-									"否": function() {
-											$( this ).dialog( "close" );
+									close: function() {
+											$("#confirmMsg").text("");
+									},
+									buttons: {
+											"是": function() {
+												$( this ).dialog( "close" );
+												var remark = showSelectTousseDiscardCauseWin();
+												if(remark != undefined && remark != ""){
+													$.ajax({
+														url : WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+														type : "post",
+														data : {ids : ids , reason : remark},
+														async : false,
+														success : function(res){
+															loadBarcodeDevice(barcodeTemp);
+														}
+													})
+												}
+											},
+											"否": function() {
+													$( this ).dialog( "close" );
+											}
 									}
+								});
 							}
-						});
-            		}
+							else{
+								alertDiv(msg.errorMessage);
+							}
+						}else{
+							alertDiv(msg.errorMessage);
+						}
+					}
             	}else if(msg.orgUnit!= null){
             		//只更新科室名称及编码信息(since2015-12-16 SYF),添加新单时才更新部门
             		if(params_appId == null || params_appId == "null" || params_appId == ""){