Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r37541 -r37606
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 37541)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 37606)
@@ -1107,27 +1107,28 @@
 	                    		ti.setOperator(operator);
 	                    	}
 	                    }
-	                    //启用上述配置项后，进行了退货重发后的器械包，在【器械包信息】中的器械包追溯信息的“申请记录”页签中新增字段“退货重发”，
-	                    //用于记录该器械包是否进行过退货重发；
-	                    boolean enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction = 
-	                    		ConfigUtils.getSystemSetConfigByNameBool("enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction");
-	                    if(enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction){
-	                    	ReturnGoodsRecord returnGoodsRecord = null;
-	                    	if(!ti.isComboTousse()){
-	                    		returnGoodsRecord = ti.getReturnGoodsRecord(objectDao);
-	                    	}
-	                    	if(returnGoodsRecord != null){
-	                    		RecyclingApplication recyclingApplication = returnGoodsRecord.getRecyclingApplication();
-	                    		if(recyclingApplication != null){
-	                    			String returnMsg = String.format("进行了退货重发操作，原申请单号为“%s”，新申请单号为“%s”。", ip.getSerialNumber(), recyclingApplication.getSerialNumber());
-	                    			invoicePlanJSON.put("returnMsg", returnMsg);
-	                    		}
-	                    	}
-	                    }
 	                } 
 				}
 				
+				//启用上述配置项后，进行了退货重发后的器械包，在【器械包信息】中的器械包追溯信息的“申请记录”页签中新增字段“退货重发”，
+                //用于记录该器械包是否进行过退货重发；
+                boolean enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction = 
+                		ConfigUtils.getSystemSetConfigByNameBool("enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction");
+                if(enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction){
+                	if(DatabaseUtil.isPoIdValid(ti.getInvoicePlanID())
+                			&& DatabaseUtil.isPoIdValid(ti.getRtInvoicePlanId())){
+                		//来源申请单
+                		InvoicePlan sourceInvoicePlan = (InvoicePlan) objectDao.getByProperty(InvoicePlan.class.getSimpleName(), "id", ti.getInvoicePlanID());
+                		//退货重发产生的申请单
+                		InvoicePlan rtInvoicePlan = (InvoicePlan) objectDao.getByProperty(InvoicePlan.class.getSimpleName(), "id", ti.getRtInvoicePlanId());
+                		if(sourceInvoicePlan != null && rtInvoicePlan != null){
+                			String returnMsg = String.format("进行了退货重发操作，原申请单号为“%s”，新申请单号为“%s”。", sourceInvoicePlan.getSerialNumber(), rtInvoicePlan.getSerialNumber());
+                			invoicePlanJSON.put("returnMsg", returnMsg);
+                		}
+                	}
+                }
 				
+				
                 //二次回收记录
                 JSONObject recyclingItemJSON = new JSONObject();
                 RecyclingRecord recyclingRecord2 = recyclingRecordManager.getlastTousseRecyclingRecordByBarcode(ti.getBarcode());