Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15455 -r15456
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15455)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15456)
@@ -2048,7 +2048,7 @@
 		writebackForZSLY(invoiceList);
 		
 		writebackForGDSY(invoiceList);
-	
+//		throw new RuntimeException("发货速度测试！");
 	}
 
 	/**
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r15450 -r15456
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 15450)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 15456)
@@ -915,8 +915,8 @@
 		}
 
 		String sql = String
-				.format(" WHERE (%s) and (%s) and (%s) and (%s) and (%s) and (%s) and (%s) and (%s)",
-						where1, where2, where3, where4, where5, where6, where7, where8);
+				.format(" WHERE (%s) and (%s) and (%s) and (%s) and (%s) and (%s) and (%s) and (%s) and (po.type!='%s')",
+						where1, where2, where3, where4, where5, where6, where7, where8,InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION);
 		return sql;
 	}
 
@@ -951,7 +951,7 @@
 				buildSqlForGetInvoicePlanByOrgUnitCodingsAndTousseType(orgUnitCodings, applyDate, tousseType);
 //		sql += " ORDER BY sequence, applicationTime";
 //		return objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql);
-		String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s and (po.type!='%s') ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql,InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION);
+		String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s  ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql);
 		return objectDao.findByHql(hql);
 	}