Index: ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp
===================================================================
diff -u -r12331 -r16764
--- ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp	(.../supplyRoomUnfinishedWork.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp	(.../supplyRoomUnfinishedWork.jsp)	(revision 16764)
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan" %>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,6 +11,28 @@
 window.JSON ||
 document.write('<script type="text/javascript" src="${ctx}/ext/js/json3.min.js"/>');
 
+var SSTS_RecycApplication_Delete = true;
+<operation:authorize ifAnyGranted="SSTS_RecycApplication_Delete">
+    SSTS_RecycApplication_Delete = false;
+</operation:authorize>
+
+var SSTS_Invoice_End = true;
+<operation:authorize ifAnyGranted="SSTS_Invoice_End">
+SSTS_Invoice_End = false;
+</operation:authorize>
+
+var SSTS_PackingTask_Delete = true;
+<operation:authorize ifAnyGranted="SSTS_PackingTask_Delete">
+SSTS_PackingTask_Delete = false;
+</operation:authorize>
+
+var SSTS_SystemWarning_TousseGoods_delete = true;
+<operation:authorize ifAnyGranted="SSTS_SystemWarning_TousseGoods_delete">
+SSTS_SystemWarning_TousseGoods_delete = false;
+</operation:authorize>
+
+var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>';
+
 </script>
 
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
@@ -18,11 +41,13 @@
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDatePicker.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/terminateInvoicePlan.js"></script>
 <script type="text/javascript" src="supplyRoomsUnfinishedWork.js"></script>
 <script type="text/javascript" src="recyclingAppcationShow.js"></script>
 <script type="text/javascript" src="invoiceShow.js"></script>
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css" />
 <script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
 <script type="text/javascript">
 
Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
===================================================================
diff -u -r14030 -r16764
--- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 14030)
+++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 16764)
@@ -82,6 +82,146 @@
 }
 
 Ext.onReady(function() {
+	
+	/**
+	 * 删除申请单
+	 */ 
+	function deleteRecyclingApplication(grid) {
+		var records = grid.getSelectionModel().getSelections();
+		
+		if (records.length == 0) {
+			showResult("请选择要删除的申请单！");
+			return false;
+		}
+		var ids = null;
+		for ( var i = 0, len = records.length; i < len; i++) {
+			var hasPrint = records[i].data['printed'];
+			var deliverStatus = records[i].data['deliverStatus'];
+			var recyclingStatus = records[i].data['recyclingStatus'];
+			var serialNum = records[i].data['serialNumber'];
+			var applicationType =  records[0].data['type'];
+			if(hasPrint != unPrint){
+				showResult('流水号为【'+serialNum+"】的申请单已经打印，不能删除！");
+				return false;
+			}
+			if(deliverStatus=='已终止' || recyclingStatus == '已终止' ){
+				showResult('流水号为【'+serialNum+"】的申请单已终止，不能删除！");
+				return false;
+			}
+			if(recyclingStatus == '已回收' || recyclingStatus == '部分回收'){
+				showResult('流水号为【'+serialNum+"】的申请单已回收，不能删除！");
+				return false;
+			}
+			if(deliverStatus =='已发货' || deliverStatus =='部分发货'){
+				showResult('流水号为【'+serialNum+"】的申请单已发货或部分发货，不能删除！");
+				return false;
+			}
+			if(applicationType != null && applicationType!="" && applicationType == "借物单"){
+				if(records[i].data['returnStatus'] == "已归还"){
+					showResult('流水号为【'+serialNum+"】的借物单已归还，不能删除！");
+					return false;
+				}
+			}
+			if (ids == null) {
+				ids = records[i].data['id'];
+			} else {
+				ids = ids + ';' + records[i].data['id'];
+			}
+		}
+		
+		top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的申请单信息？",
+			function(button, text) {
+				if ("yes" == button){
+					Ext.Ajax.request({
+						url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!deleteRecyclingApplication.do',
+						params : {ids : ids},
+						success : function(response, options) {
+							showResult(response.responseText);
+							grid.getStore().reload();
+						},
+						failure : function(response, options) {
+							showResult(response.responseText);
+						}
+					});
+				}
+			}
+		);
+	}
+	function deletePackingTask(ids){
+		top.Ext4.MessageBox.confirm("请确认","是否确定要删除选中的装配任务信息？",
+				function(button, text) {
+			if ("yes" == button){
+				top.Ext4.Ajax.request({
+					url : WWWROOT + '/disinfectSystem/packingAction!deletePackingTask.do',
+					params : {
+						ids : ids
+					},success : function(response, options) {
+						var result = top.Ext4.decode(response.responseText);
+						var success = result.success;
+						if (true != success) {
+							showResult(result.cause);
+							return;
+						} else {
+							showResult('删除成功');
+							// 刷新waitPackingTreeGrid
+							Ext.getCmp('packingGrid').getStore().reload();
+						}
+					},
+					failure : function(response, options) {
+						showResult('删除失败');
+					}
+				});
+			}
+		});
+	}
+	/**
+	 * 显示器械包废弃原因
+	 */
+	function showSelectTousseDiscardCauseWin(){
+		return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
+	}
+	function addTousseDiscardTbar(grid){
+		var tbar = {
+			text : '废弃',
+			iconCls : 'Cancel',
+			hidden:SSTS_SystemWarning_TousseGoods_delete,
+			handler : function() {
+				var selectionModel = grid.getSelectionModel();
+				var selections = [];
+				if(!selectionModel.hasSelection()){
+					showResult("未选中任何记录!");
+					return;
+				}else{
+					selectionModel.each(function(row){
+						selections.push(row.data.id);
+					});
+					if(selections.length <= 0){
+						showResult("未选中任何记录!");
+						return;
+					}
+					if(selections.length>0){
+						 var remark = showSelectTousseDiscardCauseWin();
+						 if(remark != undefined && remark != ""){
+							 var ids = selections.join(';');
+					    	 Ext.Ajax.request({
+					    	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+					    	        params : {ids : ids,reason:remark},
+					    	        success : function(response, options) {
+					    	            showResult("废弃成功!");
+					    	            grid.getStore().reload();
+					    	        },
+					    	        failure : function(response, options) {}
+					    	    });
+					    }
+					}
+				}
+			}
+		};
+        var tbItem = grid.getTopToolbar();   
+            tbItem.push(tbar);    
+            grid.doLayout();  
+	}
+	
 	Ext.QuickTips.init();
 	
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
@@ -213,7 +353,9 @@
 		});
 		
 		//申请单信息
+		var applicationSm = new Ext.grid.CheckboxSelectionModel();
 	    var applicationColumns = new Ext.grid.ColumnModel([
+	        applicationSm,                              
 			{header : "流水号",width : 75,dataIndex : 'serialNumber'}, 
 			{header : "申请人",width : 60,dataIndex : 'applicant'},
 			{header : "申请时间",width : 110,dataIndex : 'applicationTime', renderer : myDateFormatByMinute}, 
@@ -234,15 +376,19 @@
 //			{header : "状态",width : 60,dataIndex : 'status'}
 	    ]);
 	    //	    装配记录信息
+	    var packingSm = new Ext.grid.CheckboxSelectionModel();
 	    var packingColumns = new Ext.grid.ColumnModel([
+	        packingSm,
 			{header : "器械包名称",width : 250,dataIndex : 'tousseDefinition.name'},
 			{header : "数量",width : 80,dataIndex : 'amount'},
 			{header : "待装配数量",width : 80,dataIndex : 'unPackAmount'},
 			{header : "开始时间",width : 150,dataIndex : 'startTime', renderer : myDateFormatByMinute},
 			{header : "状态",width : 60,dataIndex : 'status'}
 	    ]);
 	    //审核信息
+	    var reviewSm = new Ext.grid.CheckboxSelectionModel();
 	    var reviewColumns = new Ext.grid.ColumnModel([
+	         reviewSm,
 	         {header : "器械包名称",width : 130,dataIndex : 'tousseName',sortable:false},
 		     {header : "条码",width : 65,dataIndex : 'barcode',sortable:false},
 		     {header : "操作员",width : 50,dataIndex : 'operator',sortable:false},
@@ -253,7 +399,9 @@
 		     {header : "包装类型",width : 60,dataIndex : 'packageType',sortable:false}
 	    ]);
 	    //灭菌信息
+	    var SterilizationSm = new Ext.grid.CheckboxSelectionModel();
 	    var SterilizationColumns = new Ext.grid.ColumnModel([
+	         SterilizationSm,
              {header : "器械包名称",width : 130,dataIndex : 'tousseName',sortable:false},
 		     {header : "条码",width : 65,dataIndex : 'barcode',sortable:false},
 		     {header : "操作员",width : 50,dataIndex : 'operator',sortable:false},
@@ -333,6 +481,7 @@
 	    		totalProperty : 'totalCount',
 	    		root : 'data'
 	    	},[
+	    	   	   {name:'id'},
 	    		   {name: 'tousseDefinition.name'},
 	    		   {name: 'startTime'},
 	    		   {name: 'amount'},
@@ -357,6 +506,7 @@
 	    		totalProperty : 'totalCount',
 	    		root : 'data'
 	    	},[
+	    	   	   {name: 'id'},
 	    		   {name: 'tousseName'},
 	    		   {name: 'barcode'},
 	    		   {name: 'operator'},
@@ -384,6 +534,7 @@
 	    		totalProperty : 'totalCount',
 	    		root : 'data'
 	    	},[
+	    	   	   {name: 'id'},
 	    		   {name: 'tousseName'},
 	    		   {name: 'barcode'},
 	    		   {name: 'operator'},
@@ -468,15 +619,37 @@
 	    	displayMsg: '当前显示记录: {0} - {1} 共计: {2}',
 	    	emptyMsg: "没有记录可以显示"
 	    });
-	    
+	    var applicationTbar = [{
+            text: '删除',
+            iconCls: 'btn_ext_application_del',
+            hidden: SSTS_RecycApplication_Delete,
+            handler: function () {
+                deleteRecyclingApplication(applicationGrid);
+            }
+	    }, '-', {
+            text: '终止',
+            iconCls: 'btn_ext_pause',
+            id: 'endBtn',
+            hidden: SSTS_Invoice_End,
+            handler: function () {
+                terminateInvoicePlan(applicationGrid,null,function(){applicationGrid.getStore().reload();});
+            }
+	    }];
 		applicationGrid = new Ext.grid.GridPanel({
 			title:'待回收申请单列表',
 			anchor:'100% 100%',
 			frame : false,
 			autoScroll:true,
+//			selModel: {
+////		        injectCheckbox: 0
+////		        mode: "SIMPLE",     //"SINGLE"/"SIMPLE"/"MULTI"
+////		        checkOnly: true     //只能通过checkbox选择
+//		    },
 			store : applicationStore,
 			id : 'applicationGrid',
 			cm : applicationColumns,
+			sm : applicationSm,
+			tbar : applicationTbar,
 			bbar:applicationPageBbar,
 			bodyStyle: "overflow:auto;",
 			listeners :{
@@ -512,8 +685,26 @@
 			store : packingStore,
 			id : 'packingGrid',
 			cm : packingColumns,
+			sm : packingSm,
 			bodyStyle: "overflow:auto;",
 			bbar:packingPageBbar,
+			tbar:[{
+			    text : '删除',
+			    hidden:SSTS_PackingTask_Delete,
+			    iconCls : 'btn_ext_application_del',
+			    handler : function() {
+			    	var waitPackingTreeGrid = Ext.getCmp('packingGrid');
+			    	var records = waitPackingTreeGrid.getSelectionModel().getSelections();
+			    	var ids = "";
+			    	for ( var i = 0, len = records.length; i < len; i++) {
+			    		if(ids != ""){
+		    				ids += ";";
+		    			}
+			    		ids += records[i].data['id']
+			    	}
+			    	deletePackingTask(ids);
+			    }
+			}],
 			listeners :{
 				beforerender  :function(thiz){
 					var tempGrid = Ext.getCmp('reportFormID');
@@ -529,15 +720,18 @@
 			id:'reviewGrid',
 			store : reviewStore,
 			cm : reviewColumns,
+			sm : reviewSm,
 			bodyStyle: "overflow:auto;",
 			bbar:reviewPageBbar,
+			tbar:[],
 			listeners :{
 				beforerender  :function(thiz){
 					var tempGrid = Ext.getCmp('reportFormID');
 					thiz.setHeight(tempGrid.getInnerHeight());
 				}
 			}
 		});
+		addTousseDiscardTbar(reviewGrid);
 		var sterilizationGrid = new Ext.grid.GridPanel({
 			title:'待灭菌器械包列表',
 			anchor:'100% 100%',
@@ -546,15 +740,18 @@
 			autoScroll:true,
 			store : sterilizationStore,
 			cm : SterilizationColumns,
+			sm : SterilizationSm,
 			bodyStyle: "overflow:auto;",
 			bbar:sterilizationPageBbar,
+			tbar:[],
 			listeners :{
 				beforerender  :function(thiz){
 					var tempGrid = Ext.getCmp('reportFormID');
 					thiz.setHeight(tempGrid.getInnerHeight());
 				}
 			}
 		});
+		addTousseDiscardTbar(sterilizationGrid);
 		var invoicePlanGrid = new Ext.grid.GridPanel({
 			title:'待发货器械包',
 			anchor:'100% 100%',
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r16298 -r16764
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 16298)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 16764)
@@ -586,7 +586,7 @@
 
 	public void deletePackingTask() {
 		String idStr = StrutsParamUtils.getPraramValue("ids", "");
-		String message = "";
+		boolean success = false;
 		try {
 			if (StringUtils.isNotBlank(idStr)) {
 				String[] str = idStr.split(";");
@@ -595,20 +595,13 @@
 							.getPackingTaskById(id);
 					packingManager.delete(packingTask,PackingTask.DELETE_CAUSE_MANUAL);
 				}
-				message = "{success:true}";
+				success = true;
 			}
 		} catch (Exception e) {
-			message = "{success:false}";
+			success = false;
 			e.printStackTrace();
 		}
-		HttpServletResponse httpServletResponse = StrutsParamUtils
-				.getResponse();
-		httpServletResponse.setCharacterEncoding("UTF-8");
-		try {
-			httpServletResponse.getWriter().print(message);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		StrutsResponseUtils.output(success);
 	}
 
 	public void updatePrice() {
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
===================================================================
diff -u -r16708 -r16764
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 16708)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 16764)
@@ -436,12 +436,7 @@
 			json.addProperty("success", false);
 			json.addProperty("errMsg", e.getMessage());
 		}
-		try {
-			StrutsParamUtils.getResponse().getWriter()
-			.println(json.toString());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		StrutsResponseUtils.output(json);
 	}
 	
 	/**
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r16702 -r16764
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 16702)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 16764)
@@ -9,13 +9,15 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,6 +32,7 @@
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.taglibs.standard.lang.jstl.ArraySuffix;
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
@@ -59,6 +62,8 @@
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.disinfectsystem.vo.TousseSimpleVO;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
+import com.forgon.log.model.Log;
+import com.forgon.log.service.LogManager;
 import com.forgon.timeout.model.TimeoutSetting;
 import com.forgon.timeout.service.TimeoutManager;
 import com.forgon.tools.FileSystemHelper;
@@ -69,6 +74,7 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -113,6 +119,12 @@
 	
 	private TousseDefinitionManager tousseDefinitionManager;
 	
+	private LogManager appLogManager;
+	
+	public void setAppLogManager(LogManager appLogManager) {
+		this.appLogManager = appLogManager;
+	}
+
 	public void setTousseDefinitionManager(
 			TousseDefinitionManager tousseDefinitionManager) {
 		this.tousseDefinitionManager = tousseDefinitionManager;
@@ -1147,7 +1159,7 @@
 				null);
 		JSONObject jobj = new JSONObject();
 		
-		int successCount = 0;
+//		int successCount = 0;
 		String error = null;
 		try {
 			if(StringUtils.isBlank(wasteReason)){
@@ -1156,22 +1168,36 @@
 			if(StringUtils.isBlank(ids)){
 				throw new RuntimeException("器械包id不能为空!");
 			}
-			for (String id : ids.split(";")) {
-				if (StringUtils.isNotBlank(id)) {
-					try {
-						TousseInstance tousseInstance = tousseInstanceManager
-								.getTousseInstanceById(id);
-						if(tousseInstance == null){
-							continue;
-						}
-						tousseInstanceManager.discardTousseInstance(tousseInstance, wasteReason);
-						++successCount;
-					} catch (Exception e) {
-						e.printStackTrace();
-						error = e.getMessage();
-					}
-				}
+			Collection<Long> tids = StringTools.parseToLongs(ids, ";");
+			List<TousseInstance> tis = tousseInstanceManager.getCollection("id", tids);
+			if(CollectionUtils.isNotEmpty(tis)){
+				tousseInstanceManager.discardTousseInstance(tis, wasteReason);
+				List<String> barcodes = tis.stream().map(ti->ti.getBarcode()).collect(Collectors.toList());
+				String barcodeStr = StringTools.join(barcodes, ",");
+				JSONObject description = new JSONObject();
+				description.put("操作", "废弃器械包");
+				description.put("wasteReason", wasteReason);
+				description.put("barcodes", barcodeStr);
+				appLogManager.saveLog(acegiHelper.getLoginUser(), Log.MODEL_BASEDATA, Log.TYPE_DELETE, description);
 			}
+			
+//			for (String id : ) {
+//				if (StringUtils.isNotBlank(id)) {
+//					try {
+//						
+//						TousseInstance tousseInstance = tousseInstanceManager
+//								.getTousseInstanceById(id);
+//						if(tousseInstance == null){
+//							continue;
+//						}
+//						
+//						++successCount;
+//					} catch (Exception e) {
+//						e.printStackTrace();
+//						error = e.getMessage();
+//					}
+//				}
+//			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			error = e.getMessage();
Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
===================================================================
diff -u -r16674 -r16764
--- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 16674)
+++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 16764)
@@ -1,4 +1,4 @@
-function terminateInvoicePlan(grid, formType) {
+function terminateInvoicePlan(grid, formType,refreshCallback) {
     var records = grid.getSelectionModel().getSelections();
     if (records.length == 0) {
         showResult("请选择需要终止的申请单");
@@ -69,7 +69,11 @@
             			showResult(result.errMsg);
             		}
             	}
-                grid.dwrReload();
+            	if(refreshCallback){
+            		refreshCallback();
+            	}else{
+            		grid.dwrReload();
+            	}
             },
             failure: function(response, options) {
                 showResult("终止失败，请联系管理员!");
