Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r33906 -r33907
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33906)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33907)
@@ -2490,6 +2490,11 @@
 				InvoicePlan.DELIVERSTATUS_PARTDELIVERED,InvoicePlan.STATUS_END);
 		if(StringUtils.isNotBlank(appFormType)){
 			where1 = String.format("%s and type='%s'", where1,appFormType);
+		}else{
+			//如果单类型的值为空(未传),且启用了借物单单独发货功能时,则需要排除掉借物单的这种类型(@see 业务详见:NFYY-62)
+			if(CssdUtils.getSystemSetConfigByNameBool("enableBorrowInvoicePlanSeperateSend")){
+				where1 = String.format("%s and type<>'%s'", where1,InvoicePlan.TYPE_BORROWINGSINGLE);
+			}
 		}
 		String where2 = "committedStatus = 1";
 		String where3 = "1=1";