| @@ -441,7 +441,7 @@ open class PickOrderService( | |||||
| val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let { _itemId -> | val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let { _itemId -> | ||||
| itemUomService.findSalesUnitByItemId(_itemId) | itemUomService.findSalesUnitByItemId(_itemId) | ||||
| } | } | ||||
| val ratio = (salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one) | |||||
| val ratio = BigDecimal.ONE | |||||
| val remainingQty = (inventoryLotLine?.inQty ?: zero) | val remainingQty = (inventoryLotLine?.inQty ?: zero) | ||||
| .minus(inventoryLotLine?.outQty ?: zero) | .minus(inventoryLotLine?.outQty ?: zero) | ||||
| @@ -916,7 +916,6 @@ open class PickOrderService( | |||||
| stockOutLineStatus != "completed" || | stockOutLineStatus != "completed" || | ||||
| stockOutLineQty?.toDouble() != requiredQty?.toDouble() | stockOutLineQty?.toDouble() != requiredQty?.toDouble() | ||||
| } | } | ||||
| println("Final result count: ${filteredResult.size}") | println("Final result count: ${filteredResult.size}") | ||||
| filteredResult.forEach { row -> | filteredResult.forEach { row -> | ||||
| println("Final Row: $row") | println("Final Row: $row") | ||||
| @@ -142,7 +142,7 @@ fun handleQc(stockOutLine: StockOutLine, request: UpdateStockOutLineRequest): Li | |||||
| val one = BigDecimal.ONE | val one = BigDecimal.ONE | ||||
| val targetLotLine = inventoryLotLineRepository.findById(request.inventoryLotLineId!!).orElseThrow() | val targetLotLine = inventoryLotLineRepository.findById(request.inventoryLotLineId!!).orElseThrow() | ||||
| val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let {_itemId -> itemUomRespository.findByItemIdAndSalesUnitIsTrueAndDeletedIsFalse(_itemId) } | val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let {_itemId -> itemUomRespository.findByItemIdAndSalesUnitIsTrueAndDeletedIsFalse(_itemId) } | ||||
| val ratio = (salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one).toDouble() | |||||
| val ratio = 1.0 //(salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one).toDouble() | |||||
| val targetLotLineEntry = targetLotLine.apply { | val targetLotLineEntry = targetLotLine.apply { | ||||
| this.outQty = (this.outQty?: BigDecimal.ZERO) + (request.qty.div(ratio)).toBigDecimal() | this.outQty = (this.outQty?: BigDecimal.ZERO) + (request.qty.div(ratio)).toBigDecimal() | ||||