Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java =================================================================== diff -u -r14711 -r14712 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java (.../RecyclingDamageRecordManagerImpl.java) (revision 14711) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java (.../RecyclingDamageRecordManagerImpl.java) (revision 14712) @@ -285,20 +285,13 @@ } if (saveAndAdditional) {// 保存并补充 Integer additionalAmount = 0; - if (oldDamage.getAdditionalAmount() == null - || oldDamage.getAdditionalAmount() < oldDamage - .getAmount()) { - if(oldDamage.getAdditionalAmount() != null){ - additionalAmount = oldDamage.getAdditionalAmount(); - } - oldDamage.setAdditionalPerson(AcegiHelper - .getLoginUser().getUserFullName()); - oldDamage.setAdditionalAmount(oldDamage.getAmount()); - oldDamage.setAdditionalTime(now); - } else if (oldDamage.getAdditionalAmount() > oldDamage - .getAmount()) { - return false; + if(oldDamage.getAdditionalAmount() != null){ + additionalAmount = oldDamage.getAdditionalAmount(); } + oldDamage.setAdditionalPerson(AcegiHelper + .getLoginUser().getUserFullName()); + oldDamage.setAdditionalAmount(oldDamage.getAmount()); + oldDamage.setAdditionalTime(now); //检查库存是否够减 boolean success = updateStore(oldDamage.getMaterialName(), oldDamage.getAmount() - additionalAmount); if(!success){