diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java index 5b4fe2f..dfc7b2f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java @@ -279,7 +279,13 @@ public class StorageInServiceImpl implements StorageInService { // 当两个值非空且除数非零时才进行计算 result = estimatedPrice.divide(purchaseAmount, 1, RoundingMode.HALF_UP); } - storageInDetailDO.setEstimatedPrice(orderNoDetailDO.getPurchaseRemAmounts().multiply( result)); + if (result.compareTo(BigDecimal.ZERO)==0){ + storageInDetailDO.setEstimatedPrice(BigDecimal.ZERO); + + }else { + storageInDetailDO.setEstimatedPrice(orderNoDetailDO.getPurchaseRemAmounts().multiply( result).setScale(1, RoundingMode.HALF_UP)); + + } storageInDetailDO.setActualPrice(orderNoDetailDO.getActualPrice()); storageInDetailDO.setBoomAmount(orderNoDetailDO.getBoomAmount()); storageInDetailDO.setRequireTime(orderNoDetailDO.getRequireTime());