Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r33908 -r33910
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33908)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33910)
@@ -3993,8 +3993,12 @@
 			if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) {
 				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos(' + row + ');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
 			}
-			if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') {
-				urgentAmountElement += '<div class="cameraPhoto"><img onclick="alertApplyGoodsRemark(\'' + remarkOfApplyGoods + '\');" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png" /></div>';
+			if (sstsConfig.enableApplyGoodsRemarkFunction) {
+				urgentAmountElement += '<div class="cameraPhoto">';
+				if(remarkOfApplyGoods !== ''){
+					urgentAmountElement += '<img onclick="alertApplyGoodsRemark(\'' + remarkOfApplyGoods + '\');" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png" />';
+				}
+				urgentAmountElement += '</div>';
 			}
 			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		} else {
@@ -4011,8 +4015,12 @@
 			if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) {
 				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos(' + row + ');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
 			}
-			if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') {
-				urgentAmountElement += '<div class="cameraPhoto"><img onclick="alertApplyGoodsRemark(\'' + remarkOfApplyGoods + '\');" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png" /></div>';
+			if (sstsConfig.enableApplyGoodsRemarkFunction) {
+				urgentAmountElement += '<div class="cameraPhoto">';
+				if(remarkOfApplyGoods !== ''){
+					urgentAmountElement += '<img onclick="alertApplyGoodsRemark(\'' + remarkOfApplyGoods + '\');" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png" />';
+				}
+				urgentAmountElement += '</div>';
 			}
 			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		}
@@ -6778,6 +6786,7 @@
 	DWREngine.setAsync(false);
 	RecyclingRecordTableManager.getRecyclingRecordById(id, function (record) {
 		record = eval("(" + record + ")");
+		console.log(record)
 		if (record != null) {
 			$("#id").val(record.id);
 			$("#depart").text(record.depart);
@@ -6869,6 +6878,14 @@
 						spelling: tousseItem.spelling,
 						packed: tousseItem.packed
 					};
+					if (application.applicationItems != null) {
+						for (var k = 0; k < application.applicationItems.length; k++) {
+							if(tousseItem.tousseDefinitionId == application.applicationItems[k].tousseDefinitionId){
+								toussItem.remarkOfApplyGoods = application.applicationItems[k].remarkOfApplyGoods;
+								continue;
+							}
+						}
+					}
 					var successAdd = addToussItem(toussItem, false);
 					if (!successAdd) {
 						continue;
@@ -6948,7 +6965,6 @@
 				deliverStatus = application.deliverStatus;
 				endStatus = application.endStatus;
 			}
-
 			if (applicationitems != null) {
 				for (var i = 0; i < applicationitems.length; i++) {
 					var tousseDefinitionId = applicationitems[i].tousseDefinitionId;
@@ -6996,6 +7012,7 @@
 								tousseRemark: '',
 								errorDamageQmKey: errorDamageQmKey,
 								spelling: applicationitems[i].spelling,
+								remarkOfApplyGoods: applicationitems[i].remarkOfApplyGoods,
 								packed: applicationitems[i].packed
 							};
 							addToussItem(toussItem, false);
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
 						}