Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r26250 -r26251
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26250)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26251)
@@ -4141,9 +4141,11 @@
 			}
 			existApplication = getSameStatusRecyclingApplicationForUpdate(recyclingApplication,isCommit);
 			//2.已打印或者已发货、部分发货的申请单不合并。
-			if(InvoicePlan.PRINT_STATUS_PRINTED == existApplication.getPrinted() || InvoicePlan.DELIVERSTATUS_DELIVERED.equals(existApplication.getDeliverStatus())
-					|| InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(existApplication.getDeliverStatus())){
-				isNeedToBeMerged = false;
+			if(existApplication !=null){
+				if(InvoicePlan.PRINT_STATUS_PRINTED == existApplication.getPrinted() || InvoicePlan.DELIVERSTATUS_DELIVERED.equals(existApplication.getDeliverStatus())
+						|| InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(existApplication.getDeliverStatus())){
+					isNeedToBeMerged = false;
+				}
 			}
 			//如果需要合并,则进行相应的处理
 			if (isNeedToBeMerged) {