Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33787 -r33814
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33787)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33814)
@@ -766,13 +766,15 @@
 		if (delNode != null) {
 			var amount = delNode.get("amount");
 			var pNode = delNode.parentNode;
-			var t_amount = pNode.get("amount");
-			var t_unPackingAmount = pNode.get("unPackingAmount");
-			if (t_amount == amount) {
-				pNode.remove();
-			} else {
-				pNode.set("amount", t_amount - amount);
-				pNode.set('unPackingAmount', t_unPackingAmount ? (t_unPackingAmount - amount) : (t_amount - amount));
+			if (pNode) {
+				var t_amount = pNode.get("amount");
+				var t_unPackingAmount = pNode.get("unPackingAmount");
+				if (t_amount == amount) {
+					pNode.remove();
+				} else {
+					pNode.set("amount", t_amount - amount);
+					pNode.set('unPackingAmount', t_unPackingAmount ? (t_unPackingAmount - amount) : (t_amount - amount));
+				}
 			}
 		}
 	}
@@ -883,6 +885,8 @@
 			{ name: 'maxAmount' },
 			{ name: 'urgentLevelObj' },
 			{ name: 'colorCode' },
+			{ name: 'remarkOfApplyGoods' },
+			{ name: 'haveRemarkOfApplyGoods' },
 			{ name: 'classifiedItemAmountInfo' },
 			{ name: 'patient' },
 			{ name: 'needInspectMaterials' },
@@ -917,6 +921,12 @@
 					if (record.get('replenishMaterils')) {
 						showName = '<font style=" background-color:yellow">' + showName + '</font>';
 					}
+					if (sstsConfig.enableApplyGoodsRemarkFunction && record.get('remarkOfApplyGoods') && record.get('remarkOfApplyGoods') !== '') {
+						showName = '<img style="width:16px;height:16px" align="middle" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png">' + showName;
+					}
+					if (sstsConfig.enableApplyGoodsRemarkFunction && !record.get('leaf') && record.get('haveRemarkOfApplyGoods')) {
+						showName = '<img style="width:16px;height:16px" align="middle" src="' + WWWROOT + '/disinfectsystem/touchScreen/recycle/1980/images/remark.png">' + showName;
+					}
 					//根据器械包大小物品名称显示不同颜色
 					if (record.get('leaf') && sstsConfig.tousseSizeColor) {
 						if (record.get("packageSize") == "超大包") {
@@ -3100,29 +3110,41 @@
 		if (record) {
 			var errorDamageRemarkInfo = '';
 			var errorDamageRemarkId = '';
+			var remarkOfApplyGoodsInfo = '';
 			if (record.childNodes.length > 0) {
 				var children = record.childNodes;
 				for (var i = 0; i < children.length; i++) {
+					var remarkOfApplyGoods = children[i].data.remarkOfApplyGoods || '';
 					if (children[i].raw.errorDamageRemarkInfo !== '' && (children[i].data.damages.length > 0 || children[i].data.errors.length > 0)) {
 						errorDamageRemarkInfo = children[i].raw.errorDamageRemarkInfo;
 						errorDamageRemarkId = children[i].raw.errorDamageRemarkId;
 					}
+					if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') {
+						remarkOfApplyGoodsInfo = remarkOfApplyGoods;
+					}
 				}
 			} else {
 				if (record.raw.errorDamageRemarkInfo !== '' && (record.data.damages.length > 0 || record.data.errors.length > 0)) {
 					errorDamageRemarkInfo = record.raw.errorDamageRemarkInfo;
 					errorDamageRemarkId = record.raw.errorDamageRemarkId;
 				}
+				if (sstsConfig.enableApplyGoodsRemarkFunction && record.data.remarkOfApplyGoods !== '') {
+					remarkOfApplyGoodsInfo = record.data.remarkOfApplyGoods;
+				}
 			}
-			if (errorDamageRemarkInfo == '') {
-				Ext4.getCmp('remark').setValue('');
-				Ext4.getCmp('errorDamageRemarkId').setValue('');
-				Ext4.getCmp('errorDamageRemarkInfo').setValue('');
-			} else {
-				Ext4.getCmp('remark').setValue(errorDamageRemarkInfo);
+			var remarks = '';
+			if (errorDamageRemarkInfo !== '') {
+				remarks += errorDamageRemarkInfo;
 				Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
 				Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemarkInfo);
+			} else {
+				Ext4.getCmp('errorDamageRemarkId').setValue('');
+				Ext4.getCmp('errorDamageRemarkInfo').setValue('');
 			}
+			if (remarkOfApplyGoodsInfo !== '') {
+				remarks += remarkOfApplyGoodsInfo;
+			}
+			Ext4.getCmp('remark').setValue(remarks);
 		}
 	}
 
@@ -5821,7 +5843,7 @@
 		}, {
 			xtype: 'hiddenfield',
 			id: 'waitPackingPageSize',
-			value: sstsConfig.pageSizeOfPackingTaskFolders?parseInt(sstsConfig.pageSizeOfPackingTaskFolders):1000
+			value: sstsConfig.pageSizeOfPackingTaskFolders ? parseInt(sstsConfig.pageSizeOfPackingTaskFolders) : 1000
 		}]
 	});