Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r13359 -r13367
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 13359)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 13367)
@@ -892,6 +892,7 @@
 	// 覆盖如下参数，打印申请单的所有的内容
 	printParams.printScope.printTousse = true;
 	printParams.printScope.printDisinfectGoods = true;
+	printParams.printScope.printDressing = true;
 	printParams.printScope.printDiposable = true;
 	printParams.printScope.printForeignTousse = true;
 	printParams.printScope.printApplyInfo = true; // 仅打印申请信息
@@ -2945,6 +2946,7 @@
 				        						var config = JSON.parse(JSON.stringify(printConfig.invoicePlan));
 				        						config.isPrintTousse = false;
 				        						config.isPrintDisinfectGoods = false;
+				        				        config.isPrintDressing = false;
 				        						config.isPrintDisposableGoods = true;
 				        						config.isMergePrintTousseAndDisposable = false;
 				        						config.printApplyInfo = false;
@@ -2966,6 +2968,7 @@
 		        						var config = JSON.parse(JSON.stringify(printConfig.invoicePlan));
 		        						config.isPrintTousse = true;
 		        						config.isPrintDisinfectGoods = true;
+		        						config.isPrintDressing = true;
 		        						config.isPrintDisposableGoods = false;
 		        						config.printApplyInfo = false;
 		        						
@@ -2987,6 +2990,7 @@
 		        						var config = JSON.parse(JSON.stringify(printConfig.invoicePlan));
 		        						config.isPrintTousse = true;
 		        						config.isPrintDisinfectGoods = true;
+		        						config.isPrintDressing = true;
 		        						config.isPrintDisposableGoods = true;
 		        						config.printApplyInfo = false;
 
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13365 -r13367
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13365)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13367)
@@ -2612,6 +2612,7 @@
 	private List<TousseItem> getTousseItemsByApplicationId(List<String> tousseTypes, List<Long> applicationIds) {
 		String sql = "select po from TousseItem po where po.tousseType in (:tousseTypes)"
 				+ " and po.invoicePlan.committedStatus = 1"
+				+ " and (po.isTerminated is null or po.isTerminated <> true)"
 				+ " and po.invoicePlan.id in (:applicationIds)";
 
 		Query query = objectDao.getHibernateSession().createQuery(sql);
Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r12599 -r13367
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 13367)
@@ -5,6 +5,7 @@
 	printParams.printScope = {};
 	printParams.printScope.printTousse = config.isPrintTousse;
 	printParams.printScope.printDisinfectGoods = config.isPrintDisinfectGoods;
+	printParams.printScope.printDressing = config.isPrintDressing;
 	printParams.printScope.printDiposable = config.isPrintDisposableGoods;
 	printParams.printScope.printForeignTousse = config.isPrintForeignTousse;
 	printParams.printScope.mergePrintTousseAndDiposable = config.isMergePrintTousseAndDisposable;