Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r38219 -r38236 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 38219) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 38236) @@ -1869,6 +1869,9 @@ private void setUrgentTousseItems(RecyclingRecord record, List urgentTousseItems){ if(record.getRecyclingApplication() != null && CollectionUtils.isNotEmpty(record.getRecyclingApplication().getApplicationItems())){ for (TousseItem ti : record.getRecyclingApplication().getApplicationItems()) { + if(!DatabaseUtil.isPoIdValid(ti.getTousseDefinitionId())){ + continue; + } if(ti.getUrgentLevelObj() != null){ if(CollectionUtils.isEmpty(urgentTousseItems)){ UrgentTousseItem ui = new UrgentTousseItem(); @@ -1897,6 +1900,15 @@ } } } + if(CollectionUtils.isNotEmpty(urgentTousseItems)){ + Iterator it = urgentTousseItems.iterator(); + while(it.hasNext()){ + UrgentTousseItem ti = it.next(); + if(!DatabaseUtil.isPoIdValid(ti.getTousseDefinitionID())){ + it.remove(); + } + } + } } /** * 设置原回收记录的物品 是否有丢失报损 主要是用于设置了丢失报损 又改为没有丢失报损 需要修改对应的装配任务状态的问题