Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r14632 -r14671 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14632) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14671) @@ -1025,6 +1025,14 @@ packingManager.saveOrUpdate(idCardPackingTask); } else { if (idCardPackingTask != null) { + if(PackingTask.STATUS_PACKED.equals(idCardPackingTask.getStatus())){ + throw new RecyclingRecordException(idCardBarcode+",该标识牌已装配不能修改。"); + } + String description = "删除标识牌装配任务,ID = "+idCardPackingTask.getId() + + ",装配任务ID="+idCardPackingTask.getPackingTaskID() + + ",标识牌条码="+idCardBarcode; + appLogManager.saveLog(AcegiHelper.getLoginUser(), "回收模块", "U", description); + setIDCardTousseInstanceBeforeRecycleStatus(idCardTousseInstance); packingManager.delete(idCardPackingTask); }else{