Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33856 -r33910
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33856)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33910)
@@ -660,6 +660,15 @@
 		var tousseName = result.idCard.tousseDefinition.name;
 		var taskList = result.idCard.packingTaskInfo;
 		var errorDamageRemark = result.idCard.errorDamageRemark || '';
+		var remark = errorDamageRemark;
+		if(taskList && taskList.length > 0){
+			var remarkOfApplyGoods = taskList[0].remarkOfApplyGoods || '';
+			if(remark == ''){
+				remark = remarkOfApplyGoods;
+			}else {
+				remark += '。' + remarkOfApplyGoods;
+			}
+		}
 		var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
 		if (!idCardTaskNode) {
 			idCardTaskNode = {};
@@ -727,7 +736,7 @@
 
 		Ext4.getCmp('packageType').setValue(packageType);
 		Ext4.getCmp('sterilingType').setValue(sterilingType);
-		Ext4.getCmp('remark').setValue(errorDamageRemark);
+		Ext4.getCmp('remark').setValue(remark);
 		Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemark);
 		Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
 		//根据灭菌程序设置灭菌方式的值
@@ -5037,6 +5046,7 @@
 							errorDamageRemarkId: '',
 							errorDamageRemarkInfo: '',
 							needInspectMaterials: needInspectMaterials,
+							haveRemarkOfApplyGoods:taskVO.haveRemarkOfApplyGoods,
 							tousseID: td_id,
 							maxAmount: 0
 						}