Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r19494 -r19570
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19494)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19570)
@@ -1680,6 +1680,7 @@
 				RecyclingItem ri = findRecyclingItem(recyclingRecord,tousseDefinitionID);
 				task.setErrorRemark(ri == null?"":ri.getErrorRemark());
 				task.setDamageRemark(ri == null?"":ri.getDamageRemark());
+				task.setRecyclingItemRemark(ri==null?"":ri.getRemark());
 				task.setUrgentLevel(ri.getUrgentLevel());
 				task.setUnPackAmount(task.getUnPackAmount() + amount);
 				// 设置装配任务状态
Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
===================================================================
diff -u -r19521 -r19570
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 19521)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 19570)
@@ -77,5 +77,7 @@
   //外来器械申请时显示原始包定义还是显示最近一次申请的包定义,为true表示显示原始包定义
   isShowForeignTousseAncestorDefinitionForApply:true,
   //器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签)
-  canUseBarcodeTypes : ['中标签']
+  canUseBarcodeTypes : ['中标签'],
+  //是否启用回收的备注。如果为true,在装配的时候，能看到回收时添加的备注信息。回收点击申请数量可以添加备注。默认为false
+  enableRecyclingItemRemark:true
 }
\ No newline at end of file
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
===================================================================
diff -u -r19120 -r19570
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 19120)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 19570)
@@ -7,6 +7,7 @@
 
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
+import com.forgon.tools.string.StringTools;
 
 public class WaitPackingTaskItemVo {
 	
@@ -78,6 +79,10 @@
 	 */
 	private String damageRemark;
 	/**
+	 * 回收项的备注信息
+	 */
+	private String recyclingItemRemark;
+	/**
 	 * 加急等级
 	 */
 	private String urgentLevel;
@@ -361,6 +366,14 @@
 		this.damageRemark = damageRemark;
 	}
 
+	public String getRecyclingItemRemark() {
+		return StringTools.defaultString(recyclingItemRemark);
+	}
+
+	public void setRecyclingItemRemark(String recyclingItemRemark) {
+		this.recyclingItemRemark = recyclingItemRemark;
+	}
+
 	public Integer getUrgentAmount() {
 		return urgentAmount;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19527 -r19570
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19527)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19570)
@@ -1341,6 +1341,7 @@
 				itemVo.setIsTimeout(isTimeout);
 				itemVo.setErrorRemark(task.getErrorRemark());
 				itemVo.setDamageRemark(task.getDamageRemark());
+				itemVo.setRecyclingItemRemark(task.getRecyclingItemRemark());
 				itemVo.setUrgentLevel(task.getUrgentLevel());
 				if(isTimeout){
 					itemVo.setCls("itemTimeout");
@@ -1573,7 +1574,7 @@
 	 */
 	private List<Object[]> findPackingTaskFromCssdHandleToussesConfig(String taskGroup,String basketBarcode,SupplyRoomConfig config) {
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
-		String sql = "select po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
+		String sql = "select po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
 				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
@@ -1703,6 +1704,7 @@
 				task.setDamageRemark(rs.getString("damageRemark"));
 				task.setUrgentLevel(rs.getString("urgentLevel"));
 				task.setSerialNumber(rs.getString("serialNumber"));
+				task.setRecyclingItemRemark(rs.getString("recyclingItemRemark"));
 				
 				TousseDefinition td = new TousseDefinition();
 				BigDecimal tousseDefinitionIdBigDecimal = (BigDecimal)rs.getObject("tousseDefinitionId");
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
===================================================================
diff -u -r19120 -r19570
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 19120)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 19570)
@@ -179,6 +179,10 @@
 	 */
 	private String damageRemark;
 	/**
+	 * 回收项备注
+	 */
+	private String recyclingItemRemark;
+	/**
 	 * 加急等级
 	 */
 	private String urgentLevel;
@@ -466,6 +470,14 @@
 		this.damageRemark = damageRemark;
 	}
 
+	public String getRecyclingItemRemark() {
+		return recyclingItemRemark;
+	}
+
+	public void setRecyclingItemRemark(String recyclingItemRemark) {
+		this.recyclingItemRemark = recyclingItemRemark;
+	}
+
 	public String getUrgentLevel() {
 		return urgentLevel;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r19550 -r19570
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 19550)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 19570)
@@ -1825,7 +1825,7 @@
 	var isThereIdentificationCard = toussItem.isThereIdentificationCard;
 	var tousseDefinitionID = toussItem.tousseDefinitionID;
 	var urgentAmount = toussItem.urgentAmount;
-	var tousseRemark = toussItem.tousseRemark;
+	var tousseRemark = isUndefinedOrNullOrEmpty(toussItem.tousseRemark)?'':toussItem.tousseRemark;
 	var urgentLevel = toussItem.urgentLevel?toussItem.urgentLevel:"";
 	var errorDamageQmKey = toussItem.errorDamageQmKey?toussItem.errorDamageQmKey:"";
 	var b = true;
@@ -1944,6 +1944,7 @@
 }
 
 function setRemarkToRecycleItem(row,remark){
+	remark = isUndefinedOrNullOrEmpty(remark)?"":remark;
 	$('#tousseRemark'+row).val(remark);
 	$("#dialogConfirm").dialog("close");
 }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19295 -r19570
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19295)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19570)
@@ -375,6 +375,7 @@
 	{name : 'isTimeout'},
 	{name : 'allowModifyPackageType'},
 	{name : 'errorRemark'},
+	{name : 'recyclingItemRemark'},
 	{name : 'damageRemark'},
 	{name : 'urgentLevel'},
 	{name : 'idCardBarcode'},
@@ -1368,6 +1369,21 @@
 		labelAlign:'right'
 	},{
 		columnWidth :.99,
+		xtype : 'textfield',
+		fieldLabel : '回收备注',
+		componentCls:'formItemMgn',
+		id : 'recyclingItemRemark',
+		name : 'recyclingItemRemark',
+		maxLength : '250',
+		labelWidth:90,
+		anchor : '95%',
+		allowBlank : true,
+		readOnly : true,
+		hidden:!sstsConfig.enableRecyclingItemRemark,
+        cls : 'fieldReadOnlyNoRemove',
+		labelAlign:'right'
+	},{
+		columnWidth :.99,
 		xtype : 'panel',
 		border: false,
 		layout: {
@@ -1759,7 +1775,7 @@
 		taskStatus,department,tousseType, packageType, 
 		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
 		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
-		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum){
+		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark){
 	var leaf = false;
 	if(taskId != ''){
 		leaf = true;
@@ -1796,7 +1812,8 @@
 		idCardBarcode : idCardBarcode,
 		errorRemark:errorRemark,
 		damageRemark:damageRemark,
-		serialNumber:serialNum
+		serialNumber:serialNum,
+		recyclingItemRemark:recyclingItemRemark
 	});
 	if(!leaf){
 		node.set("checked" ,false);
@@ -1942,6 +1959,17 @@
 	}
 }
 
+function refreshRecyclingItemRemark(record){
+	if(record){
+		var recyclingItemRemark  = record.get("recyclingItemRemark");
+		
+		if(!recyclingItemRemark){
+			recyclingItemRemark = '';
+		}
+		Ext4.getCmp('recyclingItemRemark').setValue(recyclingItemRemark);
+	}
+}
+
 // 重新设置标识牌的可见状态 装配任务选择包的时候
 function resetScanIDCardBarcodeVisibilityWaitPacking(node){
 	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
@@ -3009,6 +3037,7 @@
        			loadIdCardByBarcode(idCardBarcodeTemp);
        		}
        		refreshErrorAndDamageRemark(record);
+       		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
                	if(record.get('checked') == false){
@@ -3103,7 +3132,7 @@
 										parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
 												'','',tousseType, packageType, 
 												sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
-												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'');
+												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','');
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -3165,7 +3194,7 @@
 											var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
 													taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
 													errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
-													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber);
+													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);
@@ -3310,6 +3339,7 @@
        			Ext4.getCmp('idCardUseAmount').setValue("");
        		}
        		refreshErrorAndDamageRemark(record);
+       		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
            		if(record.get('checked') == false){