Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r37898 -r38059 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 37898) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38059) @@ -7736,10 +7736,19 @@ } if(!StringUtils.equals(tousseInstance.getRemark(), remark)){ modifyContent.append("字段:备注,原值:").append(tousseInstance.getRemark()).append(",新值:").append(remark).append(";"); + ErrorDamageRemark errorDamageRemark = tousseInstance.getErrorDamageRemark(); if(StringUtils.isBlank(remark)){ tousseInstance.setRemark(null); + if(errorDamageRemark != null){ + errorDamageRemark.setCustomErrorDamageRemark(null); + objectDao.update(errorDamageRemark); + } }else{ tousseInstance.setRemark(remark); + if(errorDamageRemark != null){ + errorDamageRemark.setCustomErrorDamageRemark(remark); + objectDao.update(errorDamageRemark); + } } modifyPackingRecord = true; }