Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r41014 -r41019
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41014)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41019)
@@ -8881,12 +8881,13 @@
 			if(!DatabaseUtil.isPoIdValid(tousseInstance.getInvoicePlanID())){
 				//tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId());
 				//针对DGSETYY-121问题,应改为将InvoicePlanID字段赋值为退货记录关联的新生成的申请人为"退货重发"的申请单
-				tousseInstance.setInvoicePlanID(currentPackingTask.getRtInvoicePlanId());
-			}else if(PackingTask.TASK_QUALITY_MONITOR.equals(currentPackingTask.getTaskType()) && DatabaseUtil.isPoIdValid(currentPackingTask.getRpInvoicePlanId())){
-				tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId());
-			}else if(PackingTask.TASK_RETURNGOODS.equals(currentPackingTask.getTaskType()) && DatabaseUtil.isPoIdValid(currentPackingTask.getRtInvoicePlanId())){
-				tousseInstance.setInvoicePlanID(currentPackingTask.getRtInvoicePlanId());
+				if(PackingTask.TASK_QUALITY_MONITOR.equals(currentPackingTask.getTaskType()) && DatabaseUtil.isPoIdValid(currentPackingTask.getRpInvoicePlanId())){
+					tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId());
+				}else if(PackingTask.TASK_RETURNGOODS.equals(currentPackingTask.getTaskType()) && DatabaseUtil.isPoIdValid(currentPackingTask.getRtInvoicePlanId())){
+					tousseInstance.setInvoicePlanID(currentPackingTask.getRtInvoicePlanId());
+				}
 			}
+			
 			if(DatabaseUtil.isPoIdValid(currentPackingTask.getRpTousseItemId())){
 				tousseInstance.setForeignProxyItem_id(currentPackingTask.getRpTousseItemId());
 			}