diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt
index d64983f..8368108 100644
--- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt
@@ -245,7 +245,9 @@ open class PurchaseOrderService(
 
         val po = purchaseOrderRepository.findById(id).orElseThrow()
         if (unfinishedLines.isEmpty()) {
-            val stockInLines = stockInLineRepository.findAllByPurchaseOrderIdAndDeletedFalse(po.id).orElseThrow()
+            val stockInLines = stockInLineRepository.findAllByPurchaseOrderIdAndDeletedFalse(po.id!!).orElseThrow().filter {
+                it.status == StockInLineStatus.COMPLETE.status
+            }
             po.apply {
                 status = PurchaseOrderStatus.COMPLETED
             }
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
index f8f5611..3c27478 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/SuggestedPickLotService.kt
@@ -71,7 +71,7 @@ open class SuggestedPickLotService(
         val suggestedList: MutableList<SuggestedPickLot> = mutableListOf()
         val holdQtyMap: MutableMap<Long?, BigDecimal?> = request.holdQtyMap
 
-        // get current inventory lot line qty & grouped by item Id
+        // get current inventory lot line qty & grouped by item id
         val availableInventoryLotLines = inventoryLotLineService
             .allInventoryLotLinesByItemIdIn(itemIds)
             .filter { it.status == InventoryLotLineStatus.AVAILABLE.value }
@@ -182,6 +182,6 @@ open class SuggestedPickLotService(
     }
 
     open fun saveAll(request: List<SuggestedPickLot>): List<SuggestedPickLot> {
-        return suggestedPickLotRepository.saveAll(request)
+        return suggestedPickLotRepository.saveAllAndFlush(request)
     }
 }
\ No newline at end of file