|
|
|
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service |
|
|
|
import org.springframework.transaction.annotation.Transactional |
|
|
|
import java.io.IOException |
|
|
|
import java.math.BigDecimal |
|
|
|
import java.math.RoundingMode |
|
|
|
import kotlin.jvm.optionals.getOrNull |
|
|
|
|
|
|
|
@Service |
|
|
|
@@ -48,8 +49,8 @@ open class ItemUomService( |
|
|
|
val stockUnit = findStockUnitByItemId(itemId) ?: return purchaseQty; |
|
|
|
val one = BigDecimal.ONE; |
|
|
|
|
|
|
|
val baseQty = purchaseQty.multiply(purchaseUnit.ratioN ?: one).divide(purchaseUnit.ratioD ?: one) |
|
|
|
val stockQty = baseQty.multiply(stockUnit.ratioD ?: one).divide(stockUnit.ratioN ?: one) |
|
|
|
val baseQty = purchaseQty.multiply(purchaseUnit.ratioN ?: one).divide(purchaseUnit.ratioD ?: one, 2, RoundingMode.HALF_UP) |
|
|
|
val stockQty = baseQty.multiply(stockUnit.ratioD ?: one).divide(stockUnit.ratioN ?: one, 2, RoundingMode.HALF_UP) |
|
|
|
|
|
|
|
return stockQty; |
|
|
|
} |
|
|
|
|