| @@ -33,7 +33,7 @@ open class JobOrderBomMaterialService( | |||||
| CreateJobOrderBomMaterialRequest( | CreateJobOrderBomMaterialRequest( | ||||
| joId = joId, | joId = joId, | ||||
| itemId = bm.item?.id, | itemId = bm.item?.id, | ||||
| reqQty = bm.qty?.times(proportion) ?: zero, | |||||
| reqQty = (bm.qty?.times(proportion) ?: zero).setScale(0,RoundingMode.CEILING), | |||||
| uomId = salesUnit?.uom?.id | uomId = salesUnit?.uom?.id | ||||
| ) | ) | ||||
| } ?: listOf() | } ?: listOf() | ||||
| @@ -46,14 +46,16 @@ open class JobOrderBomMaterialService( | |||||
| val jo = req.joId?.let { jobOrderRepository.findById(it).getOrNull() } | val jo = req.joId?.let { jobOrderRepository.findById(it).getOrNull() } | ||||
| val item = req.itemId?.let { itemsRepository.findById(it).getOrNull() } | val item = req.itemId?.let { itemsRepository.findById(it).getOrNull() } | ||||
| val uom = req.uomId?.let { uomConversionRepository.findById(it).getOrNull() } | val uom = req.uomId?.let { uomConversionRepository.findById(it).getOrNull() } | ||||
| val status = JobOrderBomMaterialStatus.entries.find { it.value === req.status } | |||||
| val roundedReqQty = req.reqQty?.setScale(0, RoundingMode.CEILING) | |||||
| val statusEnum = JobOrderBomMaterialStatus.entries.find { it.value == req.status } | |||||
| ?: JobOrderBomMaterialStatus.PENDING | |||||
| JobOrderBomMaterial().apply { | JobOrderBomMaterial().apply { | ||||
| jobOrder = jo | jobOrder = jo | ||||
| this.item = item | this.item = item | ||||
| reqQty = req.reqQty | |||||
| reqQty = roundedReqQty | |||||
| this.uom = uom | this.uom = uom | ||||
| this.status = status | |||||
| this.status = statusEnum | |||||
| } | } | ||||
| } | } | ||||