Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r29153 -r29156
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29153)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29156)
@@ -7985,10 +7985,13 @@
 			JSONObject content = new JSONObject();
 			content.put("header", disposableGoodsNames);
 			JSONArray body = new JSONArray();
-			String sql = String.format("select ti.id tousseItemId, ou.orgUnitCoding, ou.name orgUnitName, dg.name disposableGoodsName, dg.ttsName, dg.specification, ti.amount from "
-					+ " %s ti join %s ip on ip.id = ti.recyclingApplication_ID "
+			String sql = String.format("select ti.id tousseItemId, ou.orgUnitCoding, ou.name orgUnitName, dg.name disposableGoodsName, dg.ttsName, dg.specification, ti.amount, src.sequence "
+					+ " from %s ti join %s ip on ip.id = ti.recyclingApplication_ID "
 					+ " join %s ou on ip.departCoding = ou.orgUnitCoding "
-					+ " join %s dg on ti.disposableGoodsId = dg.id where (1=1) "
+					+ " join %s dg on ti.disposableGoodsId = dg.id "
+					+ " join %s src on src.orgUnitCoding = ou.orgUnitCoding "
+					+ " where (1=1) "
+					+ " and src.supplyRoomType = %s "
 					+ " and ti.tousseType = '%s' "
 					+ " and ti.isPrinted = 1 "	// 物品的打印状态为已打印的
 					+ " and (ti.isTerminated = 0 or ti.isTerminated is null) "	// 是否已终止状态为否
@@ -7997,8 +8000,8 @@
 					+ " and ip.committedstatus = 1 ",  // 未提交的单据不打印，处于暂存状态
 					TousseItem.class.getSimpleName(), InvoicePlan.class.getSimpleName(),
 					OrgUnit.class.getSimpleName(), DisposableGoods.class.getSimpleName(),
-					DisposableGoods.TYPE_NAME,
-					InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
+					SupplyRoomConfig.class.getSimpleName(), SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY,
+					DisposableGoods.TYPE_NAME, InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
 			
 			if(CollectionUtils.isNotEmpty(disposableGoodsList)){
 				sql += " and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dg.id", disposableGoodsIds);
@@ -8015,7 +8018,7 @@
 				sql += String.format(" and (ip.printTime >= %s and ip.printTime <= %s) ", start, end);
 			}
 			
-			sql += " order by ou.id ";
+			sql += " order by src.sequence ";
 			ResultSet rs = null;
 			try {
 				rs = objectDao.executeSql(sql);