diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
index d4c1201..1c1988a 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
@@ -298,7 +298,7 @@ open class StockInLineService(
                 )
                 val purchaseItemUom = itemUomRepository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(request.itemId)
                 // PO-origin: frontend sends qty in stock; non-PO: treat as purchase and convert to stock
-                val convertedBaseQty = if (stockInLine.purchaseOrderLine != null) {
+                val convertedBaseQty = if (stockInLine.purchaseOrderLine != null || stockInLine.jobOrder != null) {
                     line.qty
                 } else if (request.stockTakeLineId == null && stockItemUom != null && purchaseItemUom != null) {
                     (line.qty) * (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!)
@@ -710,8 +710,8 @@ open class StockInLineService(
                 )
                 val purchaseItemUom = itemUomRepository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(request.itemId)
 
-                val convertedBaseQty = if (stockInLine.purchaseOrderLine != null) {
-                    // PO-origin: qty is already stock qty
+                val convertedBaseQty = if (stockInLine.purchaseOrderLine != null || stockInLine.jobOrder != null) {
+                    // PO and Job Order: qty is already stock qty
                     line.qty
                 } else if (request.stockTakeLineId == null && stockItemUom != null && purchaseItemUom != null) {
                     // Legacy: treat as purchase qty, convert to stock qty