Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r14762 -r14928 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14762) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14928) @@ -1029,6 +1029,12 @@ continue; } } + //标识牌不做快速回收 + if(Constants.STR_YES.equals(ti.getIsThereIdentificationCard()) || + (td != null && Constants.STR_NO.equals(td.getIsDisableIDCard()))){ + continue; + } + Integer recyclingAmount = ti.getRecyclingAmount(); if(recyclingAmount == null){ if(!InvoicePlan.READED.equals(invoicePlan.getReaded())){