Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28692 -r28704 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28692) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28704) @@ -3876,16 +3876,17 @@ if (recyclingContext.isTally()){ appItem.setTallyAmount(0); } - //申请数量不是0也删除 - applicationItemList.remove(appItem); - if(DatabaseUtil.isPoIdValid(appItem.getId())){ - JSONUtil.addLogProperty(logDetail, "包定义id", appItem.getTousseDefinitionId()); - JSONUtil.addLogProperty(logDetail, "器械包名称", appItem.getTousseName()); - JSONUtil.addLogProperty(logDetail, "申请数量", appItem.getAmount()); - JSONUtil.addLogProperty(logDetail, "回收数量", appItem.getRecyclingAmount()); - JSONUtil.addLogProperty(logDetail, "操作", "删除申请项"); - details.add(logDetail); - tousseItemManager.delete(appItem); + if(appItem.getAmount() == 0){ + applicationItemList.remove(appItem); + if(DatabaseUtil.isPoIdValid(appItem.getId())){ + JSONUtil.addLogProperty(logDetail, "包定义id", appItem.getTousseDefinitionId()); + JSONUtil.addLogProperty(logDetail, "器械包名称", appItem.getTousseName()); + JSONUtil.addLogProperty(logDetail, "申请数量", appItem.getAmount()); + JSONUtil.addLogProperty(logDetail, "回收数量", appItem.getRecyclingAmount()); + JSONUtil.addLogProperty(logDetail, "操作", "删除申请项"); + details.add(logDetail); + tousseItemManager.delete(appItem); + } } } }