Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r16002 -r16071
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16002)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16071)
@@ -65,6 +65,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
+import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
@@ -77,6 +78,7 @@
 import com.forgon.disinfectsystem.invoicemanager.vo.InvoicePrintVo;
 import com.forgon.disinfectsystem.invoicemanager.vo.ScanGoodsVo;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
+import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManager;
 import com.forgon.disinfectsystem.stockmanage.cssdstock.service.TousseStockManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
@@ -142,6 +144,13 @@
 
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private RecyclingRecordManager recyclingRecordManager;
+	
+	public void setRecyclingRecordManager(
+			RecyclingRecordManager recyclingRecordManager) {
+		this.recyclingRecordManager = recyclingRecordManager;
+	}
+
 	/**
 	 * 器械包交接manager类
 	 */
@@ -874,6 +883,18 @@
 				}
 			}
 		}
+		String reOperator = "";	// 清点人
+		String reUser = "";	// 回收人
+		String reType = "";	// 回收类型
+		Long recycleId = tousseInstance.getRecyclingRecordId();
+		if(recycleId != null){
+			RecyclingRecord re =recyclingRecordManager.getRecyclingRecord(recycleId.toString());
+			if(re != null){
+				reOperator = re.getOperator();
+				reUser = re.getRecyclingUser();
+				reType = re.getRecyclingApplicationType();
+			}
+		}
 //		if(ttRecord != null){
 //			ttRecord.setHandover("小明");
 //			ttRecord.setTakeover("小七");
@@ -899,6 +920,9 @@
 		map.put("washClassifyBaskets", basketJsons);
 		map.put("tousseTransitionRecord", ttRecord);
 		map.put("sterilizationPosition", sterilizationPosition);
+		map.put("reOperator", reOperator);
+		map.put("reUser", reUser);
+		map.put("reType", reType);
 		if(sr != null){
 			map.put("sterilizationRecordID", sr.getId());
 			map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount());
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r16002 -r16071
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 16002)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 16071)
@@ -673,6 +673,68 @@
 		})]
     });
 	
+	tabsItemArr.push({
+        title: '<strong>回收记录</strong>',
+        layout:'fit',
+    	items:[new top.Ext.FormPanel({
+			frame : true,
+			labelSeparator : '：',
+			bodyStyle : 'padding:5px 5px 0px 50px',
+			labelAlign : 'right',
+			items : [{
+				layout : 'column',
+				autoHeight : true,
+				items : [{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						id : 'reOperator',
+						name : 'reOperator',
+						xtype : 'textfield',
+						fieldLabel : '清点人',
+						anchor : '100%',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove'
+					}]
+				},{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						id : 'reUser',
+						name : 'reUser',
+						xtype : 'textfield',
+						fieldLabel : '回收人',
+						anchor : '100%',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove'
+					}]
+				},{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						xtype : 'textfield',
+						id : 'reType',
+						name : 'reType',
+						fieldLabel : '回收类型',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove',
+						allowBlank : true,
+						anchor : '100%'
+					}]
+				}]
+			}],
+			buttons : [{
+				text : '取消',
+				handler : function() {
+					tousseInstanceWindow.close();
+				}
+			}]
+		})]
+    });
+	
     tabsItemArr.push({
         title: '<strong>废弃记录</strong>',
         layout:'fit',
@@ -753,7 +815,7 @@
 		id : 'tousseInstanceWin',
 		layout : 'fit',
 		title : '[' + tousseName + '] 追溯信息',
-		width : 600,
+		width : 630,
 		border : false,
 		modal : true,
 		autoHeight : true,
@@ -846,6 +908,9 @@
 				top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID);
 				top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);
 				top.Ext.getCmp('sterilizationPosition').setValue(result.sterilizationPosition);
+				top.Ext.getCmp('reOperator').setValue(result.reOperator);
+				top.Ext.getCmp('reUser').setValue(result.reUser);
+				top.Ext.getCmp('reType').setValue(result.reType);
 				
 				if(instance.useRecord_id != null){
 					Ext.Ajax.request({