Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r25663 -r26339
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 25663)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 26339)
@@ -1801,7 +1801,7 @@
 		RecyclingRecord recyclingRecord = null;
 		if (DatabaseUtil.isPoIdValid(recyclingRecordId)) {
 			recyclingRecord = (RecyclingRecord) objectDao
-					.getBySql("RecyclingRecord", String.format("where po.id=%s", recyclingRecordId));
+					.getBySql(RecyclingRecord.class.getSimpleName(), String.format("where po.id=%s", recyclingRecordId));
 		}
 		return recyclingRecord;
 		
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r26337 -r26339
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26337)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26339)
@@ -4972,6 +4972,10 @@
 				// 查询出该回收单对象
 				RecyclingRecord recyclingRecord = idToRecyclingRecordMap
 						.get(currentPackingTask.getSourceId());
+				//根据回收记录设置回收时间
+				if(recyclingRecord != null){
+					tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null));
+				}
 				if (recyclingRecord != null
 						&& recyclingRecord.getRecyclingApplication() != null) {
 					tousseInstance.setInvoicePlanID(recyclingRecord
@@ -5692,6 +5696,12 @@
 		tousseInstance.setInvoicePlanID(originalTousseInstance.getInvoicePlanID());
 		tousseInstance.setWashBasket(originalTousseInstance.getWashBasket());
 		tousseInstance.setRecyclingRecordId(originalTousseInstance.getRecyclingRecordId());
+		//根据回收记录id设置回收时间
+		RecyclingRecord recyclingRecord = 
+				tousseInstance.getRecyclingRecord(objectDao);
+		if(recyclingRecord != null){
+			tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null));
+		}
 		return tousseInstance;
 	}
 
@@ -6000,6 +6010,12 @@
 				tousseInstance.setRecyclingUser(oldTousseInstance.getRecyclingUser());
 				tousseInstance.setRecyclingItemId(oldTousseInstance.getRecyclingItemId());
 				tousseInstance.setRecyclingRecordId(oldTousseInstance.getRecyclingRecordId());
+				//根据回收记录id设置回收时间
+				RecyclingRecord recyclingRecord = 
+						tousseInstance.getRecyclingRecord(objectDao);
+				if(recyclingRecord != null){
+					tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null));
+				}
 				tousseInstance.setRecyclingStatus(oldTousseInstance.getRecyclingStatus());
 			}
 			tousseInstanceManager.save(tousseInstance);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
===================================================================
diff -u -r26085 -r26339
--- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java	(.../TestSecondSupplyRoom.java)	(revision 26085)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java	(.../TestSecondSupplyRoom.java)	(revision 26339)
@@ -1,8 +1,6 @@
 package test.forgon.disinfectsystem.secondsupplyroom.service;
 import static org.junit.Assert.*;
 
-
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -43,6 +41,7 @@
 import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager;
 import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
 import com.forgon.serialnumber.model.SerialNum;
+import com.forgon.tools.util.ForgonDateUtils;
 
 public class TestSecondSupplyRoom extends AbstractCSSDTest {
 	@Autowired
@@ -358,6 +357,10 @@
 		tousseInstance1.setOperationTime(new Date());
 		tousseInstance1.setOrgUnitCoding(recyclingRecord.getOrgUnitCoding());
 		tousseInstance1.setRecyclingRecordId(recyclingRecord.getId());
+		//根据回收记录设置回收时间
+		if(recyclingRecord != null){
+			tousseInstance1.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null));
+		}
 		tousseInstance1.setRecyclingOperator(recyclingRecord.getOperator());
 		tousseInstanceManager.save(tousseInstance1);
 		
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r26308 -r26339
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26308)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 26339)
@@ -5422,6 +5422,10 @@
 			tousseInstance.setDepart(recyclingRecord.getDepart());
 			tousseInstance.setDepartCoding(recyclingRecord.getDepartCode());
 			tousseInstance.setRecyclingRecordId(recyclingRecord.getId());
+			//根据回收记录设置回收时间
+			if(recyclingRecord != null){
+				tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null));
+			}
 			if(tousseInstance.getInvoicePlanID() == null){
 				tousseInstance.setInvoicePlanID(recyclingRecord.getRecyclingApplication().getId());
 			}