From c7b2b215e83fc75b5f62ebc7fa7dfbf51ebde388 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Thu, 25 Sep 2025 13:30:08 +0800
Subject: [PATCH] update

---
 .../pickOrder/service/PickOrderService.kt     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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 a45383f..29f9ac5 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
@@ -2773,11 +2773,11 @@ if (existingRecords.isNotEmpty()) {
                 return emptyList()
             }
             
-            if (pickOrder.status?.value !in listOf("assigned", "released", "picking", "completed")) {
+            if (pickOrder.status?.value !in listOf("assigned", "released", "picking")) {
                 println("❌ Pick order status is not in allowed states: ${pickOrder.status?.value}")
                 return emptyList()
             }
-            
+
             val deliveryOrder = pickOrder.deliveryOrder
             val shop = deliveryOrder?.shop
             val supplier = deliveryOrder?.supplier
@@ -3168,7 +3168,9 @@ open fun getAllPickOrderLotsWithDetailsHierarchical(userId: Long): Map<String, A
     // Get all pick orders assigned to user with PENDING or RELEASED status that have doId
     val allAssignedPickOrders = pickOrderRepository.findAllByAssignToAndStatusIn(
         user,
-        listOf(PickOrderStatus.PENDING, PickOrderStatus.RELEASED, PickOrderStatus.COMPLETED)
+        listOf(PickOrderStatus.PENDING, PickOrderStatus.RELEASED
+       // , PickOrderStatus.COMPLETED
+        )
     ).filter { it.deliveryOrder != null } // Only pick orders with doId
     
     println("🔍 DEBUG: Found ${allAssignedPickOrders.size} pick orders assigned to user $userId")
@@ -3341,11 +3343,11 @@ open fun getAllPickOrderLotsWithDetailsHierarchical(userId: Long): Map<String, A
     println("✅ Total result count: ${results.size}")
     
     // Filter out lots with null availableQty (rejected lots)
-    val filteredResults = results.filter { row ->
-        val availableQty = row["availableQty"]
-        availableQty != null
-    }
-    
+   // val filteredResults = results.filter { row ->
+        //val availableQty = row["availableQty"]
+       // availableQty != null
+  //  }
+  val filteredResults = results
     println("✅ Filtered result count: ${filteredResults.size}")
     
     // ✅ Transform flat results into hierarchical structure
@@ -3432,6 +3434,7 @@ open fun getAllPickOrderLotsWithDetailsHierarchical(userId: Long): Map<String, A
         "pickOrderLines" to pickOrderLinesMap as Any?
     )
 }
+
 // Fix the type issues in the getPickOrdersByDateAndStore method
 open fun getPickOrdersByDateAndStore(storeId: String): Map<String, Any?> {
     println("=== Debug: getPickOrdersByDateAndStore ===")