Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r36543 -r36547
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 36543)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 36547)
@@ -20,6 +20,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
+import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.specialInfection.SpecialInfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
@@ -414,9 +415,11 @@
 	 * @param specialInfectionMap 特殊感染类型
 	 * @param tdMap 已经获取到的包定义 目的是为了减少查询
 	 * @param useTo 用途 1为回收 回收时只需要申请单修改信息 不需要其他的一些东西
+	 * @param recyclingRecord 回收记录
 	 * @return
 	 */
-	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(InvoicePlan invoicePlan,boolean sort, Map<String, SpecialInfection> specialInfectionMap, Map<Long,TousseDefinition> tdMap, Integer useTo);
+	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(InvoicePlan invoicePlan,boolean sort, Map<String, SpecialInfection> specialInfectionMap, Map<Long,TousseDefinition> tdMap, Integer useTo
+			, RecyclingRecord recyclingRecord);
 	/**
 	 * 回收模块打开待回收的申请单时，把数据转换成OpenToBeRecycledRecordVo
 	 * 注意不是打开就需要的数据 不要在此方法里处理(比如目前的使用记录信息 OpenToBeRecycledRecordVo.applicationItems中的operationRoom circuitNurse,后续有时间是可以考虑优化掉 相关问题DGSDBZXYY-121)
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r36543 -r36547
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 36543)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 36547)
@@ -6389,13 +6389,13 @@
 	@Override
 	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(
 			InvoicePlan invoicePlan,boolean sort) {
-		return invoicePlan2RecyclingApplicationVo(invoicePlan, sort, null, null, null);
+		return invoicePlan2RecyclingApplicationVo(invoicePlan, sort, null, null, null, null);
 	}
 	@Override
 	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(
 			InvoicePlan invoicePlan, boolean sort,
 			Map<String, SpecialInfection> specialInfectionMap,
-			Map<Long,TousseDefinition> tdMap, Integer useTo) {
+			Map<Long,TousseDefinition> tdMap, Integer useTo, RecyclingRecord recyclingRecord) {
 		RecyclingApplicationVo vo = null;
 		if(invoicePlan != null){
 			if(tdMap == null){
@@ -6437,9 +6437,14 @@
 					vo.setOperationRoom(recyclingApplication.getOperationRoom());
 					
 				}
-				RecyclingRecord r_record = invoicePlan.getRecyclingRecord(objectDao);
-				if(r_record != null){
-					vo.setRecyclingRecordId(r_record.getId());
+				
+				if(recyclingRecord != null){
+					vo.setRecyclingRecordId(recyclingRecord.getId());
+				}else{
+					RecyclingRecord r_record = invoicePlan.getRecyclingRecord(objectDao);
+					if(r_record != null){
+						vo.setRecyclingRecordId(r_record.getId());
+					}
 				}
 			}