Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java =================================================================== diff -u -r40623 -r40653 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 40623) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 40653) @@ -3442,7 +3442,7 @@ //判断关联的一次性物品收费记录转换的申请单是否已发货;GZFDZL-163 //若该退货单对应的申请单尚未发货,则不能进行退货,用户操作时提醒用户还没发货不能退货。 Integer sendOutAmount = disposableGoodsIdSendOutAmountMap.get(preReturnGoodsItem.getDisposableGoodsID()); - if(sendOutAmount == null || sendOutAmount.intValue() < preReturnGoodsItem.getReturnAmount().intValue()){ + if(sendOutAmount == null || sendOutAmount.intValue() < preReturnGoodsItem.getPreReturnAmount().intValue()){ throw new SystemException("退货单对应的申请单尚未发货,不能进行退货!"); } objectDao.saveOrUpdate(preReturnGoodsItem);