diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
index ceb65e9..24d3c24 100644
--- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
@@ -155,7 +155,8 @@ open class PickOrderService(
                 + " max(uc.code) as uom, "
                 + " group_concat(JSON_ARRAY(ill.id)) as lotLineId, "
                 + " group_concat(JSON_ARRAY(w.name)) as warehouse, "
-                + " group_concat(JSON_ARRAY(il.lotNo)) as suggestedLotNo "
+                + " group_concat(JSON_ARRAY(il.lotNo)) as suggestedLotNo, "
+                + " pol.status "
                 + " from pick_order po "
                 + " left join pick_order_line pol on pol.poId = po.id "
                 + " left join items i on i.id = pol.itemId "
@@ -166,7 +167,7 @@ open class PickOrderService(
                 + " left join uom_conversion uc on uc.id = pol.uomId "
                 + " where po.deleted = false "
                 + " and po.consoCode = :consoCode "
-                + " group by pol.id, i.name, pol.qty "
+                + " group by pol.id, i.name, pol.qty, pol.status "
         )
         return jdbcDao.queryForList(sql.toString(), args);
     }
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt
index b3fb1ab..ba61183 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt
@@ -148,12 +148,13 @@ open class StockOutLineService(
 //            this.inventoryLotLine = newInventoryLotLine
 //        })
 //    }
-    private fun checkIsStockOutLineCompleted(pickOrderLineId: Long) {
+    @Transactional
+    fun checkIsStockOutLineCompleted(pickOrderLineId: Long) {
         val unfinishedLine = stockOutLineRepository
             .findAllByPickOrderLineIdAndDeletedFalse(pickOrderLineId)
             .filter {
                 it.status != StockOutLineStatus.COMPLETE.status
-                        ||  it.status != StockOutLineStatus.REJECTED.status
+                        &&  it.status != StockOutLineStatus.REJECTED.status
             }
         if (unfinishedLine.isEmpty()) {
             // set pick order line status to complete
@@ -165,6 +166,12 @@ open class StockOutLineService(
             )
         } else {
             // return unfinished ids to frontend
+            println(unfinishedLine.map {
+                Pair(
+                    it.id,
+                    it.status
+                )
+            })
         }
     }
     @Transactional
@@ -199,10 +206,12 @@ open class StockOutLineService(
             }
             stockOutLineEntries = handleLotChangeApprovalOrReject(stockOutLine, request)
         }
-        checkIsStockOutLineCompleted(pickOrderLineId = stockOutLine.pickOrderLine!!.id!!)
 
         val savedEntries = stockOutLineRepository.saveAllAndFlush(stockOutLineEntries.filterNotNull())
         val lineInfoList = stockOutLineRepository.findAllByIdIn(savedEntries.map { it.id!! })
+
+        checkIsStockOutLineCompleted(pickOrderLineId = stockOutLine.pickOrderLine!!.id!!)
+
         return MessageResponse(
             id = 0,
             name = "id: ${lineInfoList.map { it.id }.joinToString(separator = ",")}",