Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r37352 -r37353
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 37352)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 37353)
@@ -5616,7 +5616,7 @@
 					oldRemark = getAllRemarkOfTousseInstance(tiOfIDc, packingTaskList);
 					remark = oldRemark + (StringUtils.isBlank(currentPackingTask.getRemarkOfApplyGoods())?"":currentPackingTask.getRemarkOfApplyGoods());
 					errorDamageRemarkInfo = remark;
-					if(tiOfIDc.getErrorDamageRemark() != null){
+					if(tiOfIDc != null && tiOfIDc.getErrorDamageRemark() != null){
 						errorDamageRemarkId = tiOfIDc.getErrorDamageRemark().getId().toString();
 					}
 				}