Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25622 -r25630
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25622)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25630)
@@ -1075,6 +1075,12 @@
 	}
 }
 /**
+ * 显示申请单终止原因
+ */
+function showSelectTousseDiscardCauseWin(){
+	return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
+}
+/**
  * 根据扫描的条码加载对应的对象.
  * @param barcodeTemp
  */
@@ -1093,28 +1099,39 @@
             		if(msg.unfinishedPackingTask!=null){
             			showUnfinishedPackingTask(msg);
             		}else{
-                        $("#dialogConfirm").dialog({
-                            resizable: false,
-                            height:310,
-                            width:600,
-                            modal: true,
-                            open: function() {
-                                $("#confirmMsg").text(msg.errorMessage);
-                            },
-                            close: function() {
-                                $("#confirmMsg").text("");
-                            },
-                            buttons: {
-                                "是": function() {
-                                    // addBasketElement(msg.basket);
-                                    location.href = 'abandonDispose.jsp';
-                                    $( this ).dialog( "close" );
-                                },
-                                "否": function() {
-                                    $( this ).dialog( "close" );
-                                }
-                            }
-                        });
+						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);
+												}
+											})
+										}
+									},
+									"否": function() {
+											$( this ).dialog( "close" );
+									}
+							}
+						});
             		}
             	}else if(msg.orgUnit!= null){
             		//只更新科室名称及编码信息(since2015-12-16 SYF),添加新单时才更新部门