Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r20773 -r21096
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20773)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 21096)
@@ -2802,4 +2802,24 @@
 		}
 		return list;
 	}
+	
+	/**
+	 * 干预-修改回收时间
+	 */
+	public void modifyRecyclingTime(){
+		String id = StrutsParamUtils.getPraramValue("recyclingRecordId", null);
+		String recyclingTime = StrutsParamUtils.getPraramValue("recyclingTime", null);
+		
+		String message = null;
+		boolean success = false;
+		try {
+			recyclingRecordManager.interfere_modifyRecyclingTime(id, recyclingTime);
+			success = true;
+			message = "修改成功";
+		} catch (Exception e) {
+			message = exceptionHandler.handleException(e);
+			success = false;
+		}
+		StrutsResponseUtils.output(success,message);
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.js
===================================================================
diff -u -r21049 -r21096
--- ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.js	(.../recyclingRecordView.js)	(revision 21049)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.js	(.../recyclingRecordView.js)	(revision 21096)
@@ -1,81 +1,54 @@
 var recordGrid;
+Ext.onReady(function() {
 
-//申请科室Store
-var appDepartJsonStoreExt2 = new Ext.data.Store({
-	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
-		method : 'POST'
-	}),
-	reader : new Ext.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
-	)
-});
-//结算科室Store
-var departJsonStoreExt2 = new Ext.data.Store({
-	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
-		method : 'POST'
-	}),
-	reader : new Ext.data.JsonReader({
-		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
-	    {name : 'name',mapping : 'name'}
-	  ]
-	)
-});
-
-//灭菌炉
-var sterilizerJsonStore = new Ext.data.SimpleStore({
-	fields : [ 'sterilizerName' ],
-	url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?includeNone=yes'
-});
-
-var sterilizerTypeStore = new Ext.data.SimpleStore({
-	fields : [ 'id','typeName' ],
-	url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do'
-});
-
-var packageTypeStore = new Ext.data.SimpleStore({
-	fields : [ 'typeName' ],
-	url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageType.do'
-});
-
-function loadPeopleByStaffNum(staffNumField){
-	var staffNum = staffNumField.getValue();
-	if(staffNum){
-		UserTableManager.getUserObjByName(staffNum,function(user){
-			if(user){
-				var fullName = user.split(",")[0];
-				Ext.getCmp('packer').setValue(fullName);
-			}else{
-				showResult('找不到该员工号所对应的人员信息');
-			}
+	function modifyRecyclingTime(grid) {
+		var records = recordGrid.getSelectionModel().getSelections();
+		if (records.length == 0) {
+			showResult("请选择要修改的记录！");
+			return false;
+		}
+		if (records.length > 1) {
+			showResult("一次只能修改一个记录！");
+			return false;
+		}
+		var id = records[0].data['id'];
+		var recyclingTime = records[0].data['recyclingTime'];
+		showModifyRecyclingRecordTimeWindow(id,recyclingTime);
+	};
+	
+	/**
+	 * 创建申请单下拉框
+	 * @returns {Ext.form.ComboBox|Ext4.form.ComboBox}
+	 */
+	function createAppFormCombo() {
+		var appFormModel = sstsConfig.appFormModel || [
+			['全部申请单', '']
+			,['通用申请单', '通用申请单']
+			,['器械包申请单', '器械包申请单']
+			,['消毒物品申请单', '消毒物品申请单']
+			,['外来器械包申请单', '外来器械包申请单']
+			,['自定义器械包申请单', '自定义器械包申请单']
+			,['借物单', '借物单']
+			,['代理灭菌单', '代理灭菌单']
+			,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单']
+			,['回收申请单', '回收申请单']
+		];
+		var appFormStore = new Ext.data.SimpleStore({
+			data: appFormModel,
+			fields: ['key', 'value']
 		});
+		var comboConfig = {
+			id : 'recyclingApplicationType',
+			name : 'recyclingApplicationType',
+			fieldLabel : '申请单类型',
+			width : 150,
+			emptyText: '请选择申请单类型',
+			mode: 'local',
+			store: appFormStore
+		};
+		return ext2CompUtil.getComboBuilder().getCombo(comboConfig);
 	}
-}
-function modifyPackingTime(grid) {
-	var records = recordGrid.getSelectionModel().getSelections();
-	if (records.length == 0) {
-		showResult("请选择要修改的记录！");
-		return false;
-	}
-	if (records.length > 1) {
-		showResult("一次只能修改一个记录！");
-		return false;
-	}
-	var id = records[0].data['id'];
-	var packingTime = records[0].data['packTime'];
-	if(modifyPackingTime_tousseInstanceWindow){
-		return;
-	}
-	showModifyPackingTimeWindow(id,packingTime);
-};
-Ext.onReady(function() {
+	
 	Ext.QuickTips.init();
 	Ext.apply(Ext.QuickTips.getQuickTip(), { 
 	    showDelay: 0, 
@@ -95,81 +68,55 @@
 	
 	Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 	
-	var tousseStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseData.do',
-			method : 'GET'
-		}),
-		reader : new Ext.data.JsonReader({
-			totalProperty : 'totalCount',
-			root : 'data'
-		}, [
-			{name : 'id',mapping : 'id'}, 
-		    {name : 'spelling',mapping : 'spelling'}, 
-		    {name : 'name',mapping : 'name'}, 
-		    {name : 'externalCode',mapping : 'externalCode'}, 
-		    {name : 'displayName',mapping : 'displayName'}, 
-		    {name : 'minApplyAmount',mapping : 'minApplyAmount'}, 
-		    {name : 'unit',mapping : 'unit'}, 
-		    {name : 'amount',mapping : 'amount'}
-		])
-	});
-	
 	var recordColumns = [
 	     {header : "科室",width : 200,dataIndex : 'depart'},
-  	     {header : "装配记录时间",width : 150,dataIndex : 'packTime',renderer:myDateFormatBySecond}, 
-  	     {header : "器械包",width : 250,dataIndex : 'tousseName',renderer:filterUnderScoreName},
-  	     {header : "数量",width : 80,dataIndex : 'amount'},
-  	     {id:'operationRemark',header : "配包者",width : 100,dataIndex : 'packer'}
+  	     {header : "回收时间",width : 150,dataIndex : 'recyclingTime',renderer:myDateFormatByMinute}, 
+  	     {header : "操作员",width : 250,dataIndex : 'operator',renderer:filterUnderScoreName},
+  	     {header : "申请单类型",width : 150,dataIndex : 'recyclingApplicationType'}
   	];
 	
 	var recordReaderDetail = [
    	     {name : 'id'}, 
-   	     {name : 'orgUnitName'},
    	     {name : 'depart'},
-   	     {name : 'packTime'}, 
-   	     {name : 'packer'},
-   	     {name : 'tousseName'},
-   	     {name : 'isTraceable'},
-   	     {name : 'amount'}
+   	     {name : 'recyclingTime'},
+   	     {name : 'operator'}, 
+   	     {name : 'recyclingApplicationType'}
    	];
 	
 	var recordFilters = new Ext.grid.GridFilters({
 	      filters:[
 	        {type: 'numeric',  dataIndex: 'id'},
-	        {type: 'date',  dataIndex: 'packTime'},
-	        {type: 'string',  dataIndex: 'packer'},
 	        {type: 'string',  dataIndex: 'depart'},
-	        {type: 'string',  dataIndex: 'tousseName'},
-	        {type: 'numeric',  dataIndex: 'amount'}
+	        {type: 'date',  dataIndex: 'recyclingTime'},
+	        {type: 'string',  dataIndex: 'operator'},
+	        {type: 'string',  dataIndex: 'recyclingApplicationType'}
 	    ]
 	});
 	
 	var tbar = [{
-   		text : '修改装配时间',
+   		text : '修改回收时间',
    		iconCls : 'btn_ext_application_edit',
    		id : 'editTbar',
    		handler : function() {
-   			modifyPackingTime();
+   			modifyRecyclingTime();
    		}
    	}];
 	
 	recordGrid = new Ext.ux.ForgonPageGrid({
 		pageSize : 20,
-		defaultSortField : 'packTime',
+		defaultSortField : 'recyclingTime',
 		defaultSortDirection : 'DESC',
 		isCheckboxSelectionModel : true,
 		rememberSelected : false,
 		isShowSearchField : false,
 		columns : recordColumns,
 		plugins: recordFilters,
-		autoExpandColumn : 'operationRemark',
 		frame : false,
 		tbar: tbar,
 		border : false
 	}, 
 		recordReaderDetail,
-		PackingTableManager.findHistoryPackingRecordTableList,
+		RecyclingRecordTableManager.findRecyclingRecordTableList,
 		null
 	);
 	
@@ -178,8 +125,23 @@
 	var dt = new Date();
 	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
 	
+	//申请科室Store
+	var appDepartJsonStoreExt2 = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+		    {name : 'id',mapping : 'id'}, 
+		    {name : 'name',mapping : 'name'}
+		  ]
+		)
+	});
+	
 	var form = new Ext.form.FormPanel({
-		title : '历史装配记录',
+		title : '历史回收记录',
 		region : 'north',
 		labelAlign : 'right',
 		buttonAlign : 'center',
@@ -189,7 +151,7 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',
-		height : 90,
+		height : 120,
 		items : [{
 			layout : 'column',
 			height : 48,
@@ -230,114 +192,19 @@
 				labelWidth : 80,
 				items : [{
 					xtype : 'textfield',
-					id : 'packer',
-					name : 'packer',
-					fieldLabel : '配包者',
+					id : 'operator',
+					name : 'operator',
+					fieldLabel : '操作员',
 					width : 150
 				}]
-			}, {
+			},{
 				width : 250,
 				layout : 'form',
 				labelWidth : 80,
-				items : [{
-					xtype : 'textfield',
-					id : 'packerNumber',
-					name : 'packerNumber',
-					fieldLabel : '工号',
-					width : 150
-				}]
+				items : [createAppFormCombo()]
 			},{
 				width : 300,
 				layout : 'form',
-				labelWidth : 120,
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '灭菌篮筐条码',
-					allowBlank : true,
-					name : "inputBarcode",
-					id : "inputBarcode",
-					width : 150,
-//					anchor : '100%',
-					listeners : {
-						render : function(p) {
-							p.getEl().on('keypress',function(e) {//可输入或扫描的类型有灭菌架、灭菌筐、灭菌炉、灭菌程序、器械包;20151102新增加虚拟篮筐
-								if (e.getKey() == 13) {//回车键
-									var barcode = Ext.getCmp('inputBarcode').getValue();
-									Ext.getCmp('inputBarcode').setValue("");
-									if(!isUndefinedOrNullOrEmpty(barcode)){
-//										sterilizationColumnTree.getEl().mask("数据重新加载中，请稍等!");
-										Ext.Ajax.request( {
-											url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getTousseInstanceIdsByBarcode.do',
-											params : {
-												barcode : barcode
-											},
-											success : function(response, options) {
-//											sterilizationColumnTree.getEl().unmask();
-												var result = Ext.decode(response.responseText);
-												if(result.error){
-													showResult(result.message);
-													return;
-												}
-												var ids = result.ids;
-												rePrintBarcodeWinForScanBasket(ids,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient);
-											},
-											failure : function(response, options) {
-												showResult("请求超时，请稍后重试！");
-											}
-										});
-									}
-								}
-							});
-							p.getEl().on('focus',function(e) {
-								Ext.getCmp('inputBarcode').setValue("");
-							});
-						}
-					}
-				}]
-			},{
-				width : 300,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'combo',
-					id : 'tousseName',
-					name : 'tousseName',
-					fieldLabel : '器械包名称',
-					queryParam : 'spell',
-					minChars : 0,
-					valueField : 'name',
-					displayField : 'displayName',
-					store : new Ext.data.Store({
-						proxy : new Ext.data.HttpProxy({
-							url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
-							method : 'POST'
-						}),
-						reader : new Ext.data.JsonReader({
-							totalProperty : 'totalCount',
-							root : 'data'
-						}, [
-						    {name : 'id',mapping : 'id'}, 
-						    {name : 'spelling',mapping : 'spelling'}, 
-						    {name : 'name',mapping : 'name'}, 
-						    {name : 'displayName',mapping : 'displayName'}, 
-						    {name : 'amount',mapping : 'amount'}]
-						)
-					}),
-					forceSelection : false,
-					lazyInit : true,
-					triggerAction : 'all',
-					hideTrigger : true,
-					typeAhead : false,
-					anchor : '95%',
-					listeners : {
-						select : function(combo, record, index) {
-							combo.setValue(record.data.name);
-						}
-					}
-				}]
-			},{
-				width : 300,
-				layout : 'form',
 				labelWidth : 35,
 				items : [{
 					xtype : 'combo',
@@ -352,39 +219,30 @@
 					forceSelection : false,
 					lazyInit : true,
 					triggerAction : 'all',
-					hideTrigger : true,
+					hideTrigger : false,
 					typeAhead : false,
 					anchor : '95%'
 				}]
-			}, {
-				width : 80,
-				layout : 'form',
-				items : [{
-					xtype : 'button',
-					text : '查询',
-					minWidth : 70,
-					iconCls : 'icon_search',
-					handler : function() {
-						initQueryValueAndReload();
-					}
-				}]
-			}, {
-				width : 80,
-				layout : 'form',
-				items : [{
-					xtype : 'button',
-					text : '重置',
-					minWidth : 70,
-					iconCls : 'icon_set',
-					handler : function() {
-						$Id('startDateSearch').value = "";
-						$Id('endDateSearch').value = "";
-						$Id('packer').value = "";
-						$Id('tousseName').value = "";
-						$Id('orgUnit').value = "";
-					}
-				}]
 			}]
+		}],
+		buttons:[{
+			text : '查询',
+			minWidth : 70,
+			iconCls : 'icon_search',
+			handler : function() {
+				initQueryValueAndReload();
+			}
+		},{
+			text : '重置',
+			minWidth : 70,
+			iconCls : 'icon_set',
+			handler : function() {
+				$Id('startDateSearch').value = "";
+				$Id('endDateSearch').value = "";
+				$Id('operator').value = "";
+				$Id('recyclingApplicationType').value = "";
+				$Id('orgUnit').value = "";
+			}
 		}]
 	});
 	
@@ -401,9 +259,8 @@
 	function initQueryValueAndReload() {
 		var startDate = $Id('startDateSearch').value;
 		var endDate = $Id('endDateSearch').value;
-		var packer = Ext.getCmp('packer').getValue();
-		var packerNumber = Ext.getCmp('packerNumber').getValue();
-		var tousseName = $Id('tousseName').value;
+		var operator = Ext.getCmp('operator').getValue();
+		var recyclingApplicationType = Ext.getCmp('recyclingApplicationType').getValue();
 		if(startDate || endDate){
 			if(!startDate){
 				showResult("请录入开始时间");
@@ -419,9 +276,8 @@
 		
 		$Id('parm_s_startDateSearch').value = startDate;
 		$Id('parm_s_endDateSearch').value = endDate;
-		$Id('parm_s_packer').value = packer;
-		$Id('parm_s_packerNumber').value = packerNumber;
-		$Id('parm_s_tousseName').value = tousseName;
+		$Id('parm_s_operator').value = operator;
+		$Id('parm_s_recyclingApplicationType').value = recyclingApplicationType;
 		$Id('parm_s_orgUnit').value = $Id('orgUnit').value;;
 		recordGrid.dwrReload();
 	}
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r21064 -r21096
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 21064)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 21096)
@@ -420,6 +420,7 @@
 		    ]
 		},
         {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"灭菌器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereSterilizationView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_InterferePacking_ViewMenu,text:"回收记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/recycling/recyclingRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterferePacking_ViewMenu,text:"装配记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/packing/historyPackingView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"灭菌记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereSterilizationView1.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereWashAndDisinfectRecord_ViewMenu,text:"清洗记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r20962 -r21096
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 20962)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 21096)
@@ -85,6 +85,7 @@
 import com.forgon.disinfectsystem.vo.TousseItemVo;
 import com.forgon.disinfectsystem.washTransition.service.IdCardMaterialErrorDamageManager;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
+import com.forgon.exception.SystemException;
 import com.forgon.log.enums.ApplicationLogStatusEnum;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
@@ -97,6 +98,7 @@
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
 
 /**
@@ -3441,4 +3443,91 @@
 		}
 		return list;
 	}
+
+	@Override
+	public void interfere_modifyRecyclingTime(String id, String recyclingTime) {
+		if(!DatabaseUtil.isPoIdValid(id)){
+			throw new SystemException("回收记录id不能为空");
+		}
+		Date newTime = ForgonDateUtils.safelyParseDate(recyclingTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM);
+		if(newTime == null){
+			throw new SystemException(String.format("回收时间(%s)异常",recyclingTime));
+		}
+		RecyclingRecord record = getForUpdate(id);
+		if(record == null){
+			throw new SystemException(String.format("获取回收记录失败(回收记录id:%d)",id));
+		}
+		Date oldRecyclingTime = record.getRecyclingTime();
+		JSONObject description = new JSONObject();
+		description.put("recyclingRecordId", id);
+		JSONUtil.modifyPropertyLog(description, "recyclingTime", 
+				ForgonDateUtils.safelyFormatDate(oldRecyclingTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null), recyclingTime);
+		
+		record.setRecyclingTime(newTime);
+		save(record);
+		//修改申请单的时间
+		InvoicePlan invoicePlan = record.getRecyclingApplication();
+		if(invoicePlan != null){
+			JSONObject invoicePlanJson = new JSONObject();
+			invoicePlanJson.put("invoicePlanId", invoicePlan.getId());
+			JSONUtil.modifyPropertyLog(invoicePlanJson, "recyclingTime", 
+					ForgonDateUtils.safelyFormatDate(invoicePlan.getRecyclingTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,null),
+					ForgonDateUtils.safelyFormatDate(newTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, null));
+			description.put("关联修改申请单", invoicePlanJson);
+			invoicePlan.setRecyclingTime(newTime);
+			objectDao.saveOrUpdate(invoicePlan);
+		}
+		
+		//修改回收篮筐的回收时间
+		if(CollectionUtils.isNotEmpty(record.getClassifyBaskets())){
+			JSONArray modifyBaskets = new JSONArray();
+			for(ClassifyBasket  cb : record.getClassifyBaskets()){
+				if(cb != null && oldRecyclingTime != null){
+					boolean modify = false;
+					if(cb.getRecyclingTime() == null){
+						modify = true;
+					}else{
+						if(!oldRecyclingTime.before(cb.getRecyclingTime())){//篮筐的回收时间可能在另一次回收中更新了，所以如果没有更新，那就修改篮筐的回收时间
+							modify = true;
+						}
+					}
+					if(modify){
+						JSONObject json = new JSONObject();
+						json.put("classifyBasketId", cb.getId());
+						JSONUtil.modifyPropertyLog(json, "recyclingTime", 
+								ForgonDateUtils.safelyFormatDate(cb.getRecyclingTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,null),
+								ForgonDateUtils.safelyFormatDate(newTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, null));
+						modifyBaskets.add(json);
+						cb.setRecyclingTime(newTime);
+						classifyBasketManager.save(cb);
+					}
+				}
+			}
+			if(CollectionUtils.isNotEmpty(modifyBaskets)){
+				description.put("关联修改回收篮筐", modifyBaskets);
+			}
+		}
+		//修改装配任务的回收时间,如果有的话
+		List<PackingTask> tasks = packingManager.getUnfinishedTaskForUpdate(record.getId(), PackingTask.TASK_RECYCLINGRECORD);
+		if(CollectionUtils.isNotEmpty(tasks)){
+			JSONArray modifyTasks = new JSONArray();
+			for(PackingTask task : tasks){
+				if(task != null){
+					JSONObject json = new JSONObject();
+					json.put("packingTaskId", task.getId());
+					JSONUtil.modifyPropertyLog(json, "startTime", 
+							ForgonDateUtils.safelyFormatDate(task.getStartTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,null),
+							ForgonDateUtils.safelyFormatDate(newTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, null));
+					modifyTasks.add(json);
+					task.setStartTime(newTime);
+					packingManager.save(task);
+				}
+			}
+			if(CollectionUtils.isNotEmpty(modifyTasks)){
+				description.put("关联修改装配任务", modifyTasks);
+			}
+		}
+		//包实例的回收时间是取的回收记录的时间,没有要修改的
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INTERFERE, Log.TYPE_UPDATE, description);
+	}
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
===================================================================
diff -u -r20041 -r21096
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 20041)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 21096)
@@ -69,4 +69,10 @@
 	 * @return
 	 */
 	public List<RecyclingPrintData> loadRecyclingPrintData(RecyclingRecord recyclingRecord);
+	/**
+	 * 干预修改回收记录的时间
+	 * @param id 回收记录的id
+	 * @param recyclingTime
+	 */
+	public void interfere_modifyRecyclingTime(String id, String recyclingTime);
 }
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/modifyRecyclingTime.js
===================================================================
diff -u -r21049 -r21096
--- ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/modifyRecyclingTime.js	(.../modifyRecyclingTime.js)	(revision 21049)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/modifyRecyclingTime.js	(.../modifyRecyclingTime.js)	(revision 21096)
@@ -1,13 +1,13 @@
-var modifyPackingTime_tousseInstanceWindow = null;
 
-function showModifyPackingTimeWindow(id,packingTime){
+
+function showModifyRecyclingRecordTimeWindow(id,packingTime){
+	var recyclingRecordWin = null;
 	
 	function closeWin(){
-		modifyPackingTime_tousseInstanceWindow.close();
-		modifyPackingTime_tousseInstanceWindow = null;
+		recyclingRecordWin.close();
+		recyclingRecordWin = null;
 	}
 	var formObj = new top.Ext.FormPanel({
-					id:'formObj',
 					frame : true,
 					bodyStyle : 'padding:5px 5px 0px 5px',
 					labelSeparator : '：',
@@ -17,22 +17,18 @@
 						layout : 'column',
 						items : [{
 							xtype:'hidden',
-							id : 'id',
-							name : 'id'
+							id : 'recyclingRecordId',
+							name : 'recyclingRecordId'
 						},{
-							xtype:'hidden',
-							id : 'sterilizationRecordFinishConfirm',
-							name : 'sterilizationRecordFinishConfirm'
-						},{
 							layout : 'form',
 							columnWidth : .5,
 							cls:'edit-part2-labelwidth',
 							items : [{
-								id : 'packingTime1',
-								name : 'packingTime1',
+								id : 'recyclingTime',
+								name : 'recyclingTime',
 								xtype : 'datefieldWithMin',
 								format : 'Y-m-d H:i:s',
-								fieldLabel : '装配时间',
+								fieldLabel : '回收时间',
 								anchor : '100%',
 								allowBlank : false
 							}]
@@ -42,14 +38,13 @@
 						{
 							text : '保存',
 							handler : function() {
-								var formObj = top.Ext.getCmp('formObj');
 								if (!formObj.form.isValid()) {
 									showResult('请正确填写表单各值');
 									return false;
 								}
 								
 								formObj.form.submit({
-									url: WWWROOT + '/disinfectSystem/packingAction!modifyPackingTime.do',
+									url: WWWROOT + '/disinfectSystem/recyclingRecordAction!modifyRecyclingTime.do',
 						            method:'POST',
 						            waitMsg:'正在保存数据，请稍候',
 						            waitTitle:'提交表单',
@@ -63,7 +58,7 @@
 						            },
 						            failure:function(form, action){
 						            	var result = Ext.decode(action.response.responseText);
-						            	if(!result.success){
+						            	if(result && result.message){
 						            		showResult(result.message);
 						            	}
 						            }
@@ -78,16 +73,17 @@
 					]
 				});
     
-	modifyPackingTime_tousseInstanceWindow = new top.Ext.Window( {
-		id : 'tousseInstanceWin',
+	recyclingRecordWin = new top.Ext.Window( {
+		id : 'recyclingRecordWin',
 		layout : 'fit',
-		title : '装配记录信息',
+		title : '回收记录信息',
 		width : 580,
 		border : false,
+		modal : true,
 		items : formObj 
 	});
-	// 初始化灭菌记录表单信息
-	top.Ext.getCmp('id').setValue(id);
-	top.Ext.getCmp('packingTime1').setValue(packingTime);
-	modifyPackingTime_tousseInstanceWindow.show();
+	// 初始化回收记录表单信息
+	top.Ext.getCmp('recyclingRecordId').setValue(id);
+	top.Ext.getCmp('recyclingTime').setValue(packingTime);
+	recyclingRecordWin.show();
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.jsp
===================================================================
diff -u -r21049 -r21096
--- ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.jsp	(.../recyclingRecordView.jsp)	(revision 21049)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/recycling/recyclingRecordView.jsp	(.../recyclingRecordView.jsp)	(revision 21096)
@@ -20,17 +20,12 @@
 <title>装配管理</title>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/SterilizationRecordTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/ExpirationDateInfoTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/RecyclingRecordTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 
@@ -68,9 +63,9 @@
 var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
 </script>
 
-<script type="text/javascript" src="historyPackingView.js"></script>
+<script type="text/javascript" src="recyclingRecordView.js"></script>
 <script type="text/javascript" src="rePrintBarcodeWin.js"></script>
-<script type="text/javascript" src="modifyPackingTime.js"></script>
+<script type="text/javascript" src="modifyRecyclingTime.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js"></script>
 <!-- 外来器械包转换病人 -->
 <script type="text/javascript" src="${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js"></script>
@@ -79,7 +74,7 @@
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <%@ include file="/disinfectsystem/print/print.jsp"%>
-<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
 </head>
 <body>
@@ -89,12 +84,10 @@
 </object>
 
 <form name="parametersFrm">
-    <input type="hidden" id="parm_s_taskGroup" name="parm_s_taskGroup" value="">
     <input type="hidden" id="parm_s_startDateSearch" name="parm_s_startDateSearch" value="<%=firstDayOfMonth%>">
     <input type="hidden" id="parm_s_endDateSearch" name="parm_s_endDateSearch" value="<%=today%>">
-    <input type="hidden" id="parm_s_packer" name="parm_s_packer" value="">
-    <input type="hidden" id="parm_s_packerNumber" name="parm_s_packerNumber" value="">
-    <input type="hidden" id="parm_s_tousseName" name="parm_s_tousseName" value="">
+    <input type="hidden" id="parm_s_operator" name="parm_s_operator" value="">
+    <input type="hidden" id="parm_s_recyclingApplicationType" name="parm_s_recyclingApplicationType" value="">
     <input type="hidden" id="parm_s_orgUnit" name="parm_s_orgUnit" value="">
 </form>
 </body>