Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java =================================================================== diff -u -r17610 -r17615 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 17610) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 17615) @@ -356,14 +356,18 @@ Integer prepareRecycleAmount = item.getPrepareRecycleAmount(); if(prepareRecycleAmount == null){ //版本为2并且启用了标识牌,那预回收数量就是0,否则就是申请数量 - if("2".equals(tousseTransitionVersion) && tousseDefinitionManager.isThereIDCard(td)){ - prepareRecycleAmount = 0; + if("2".equals(tousseTransitionVersion)){ + if(tousseDefinitionManager.isThereIDCard(td)){ + prepareRecycleAmount = 0; + }else{ + prepareRecycleAmount = item.getAmount(); + if(prepareRecycleAmount > 0 && prepareRecycleAmount > scanedAmount){ + unscanedAmount = MathTools.sub(prepareRecycleAmount, scanedAmount).intValue(); + } + } }else{ prepareRecycleAmount = item.getAmount(); } - if(prepareRecycleAmount > 0 && prepareRecycleAmount > scanedAmount){ - unscanedAmount = MathTools.sub(prepareRecycleAmount, scanedAmount).intValue(); - } } jsonItem.put("prepareRecycleAmount",prepareRecycleAmount); jsonItem.put("tousseType", tousseType);