diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
index 98beb9a..d6201e6 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
@@ -44,15 +44,16 @@ class DoPickOrderService(
     fun getNextTicketNumber(datePrefix: String, storeId: String): String {
         println("🔍 DEBUG: Getting next ticket number for date prefix: $datePrefix, store: $storeId")
         try {
+            val sanitizedStoreId = storeId.replace("/", "")
             // ✅ Include store ID in the search pattern
-            val searchPattern = "${datePrefix}_${storeId}_"
+            val searchPattern = "${datePrefix}_${sanitizedStoreId}_"
             val todayTickets = doPickOrderRepository.findByTicketNoStartingWith(searchPattern)
             println("🔍 DEBUG: Found ${todayTickets.size} existing tickets with prefix $searchPattern")
             todayTickets.forEach { ticket ->
                 println("�� DEBUG: Existing ticket: ${ticket.ticketNo}, Status: ${ticket.ticketStatus}")
             }
             val nextNumber = (todayTickets.size + 1).toString().padStart(3, '0')
-            val ticketNumber = "${datePrefix}_${storeId}_${nextNumber}"
+            val ticketNumber = "${datePrefix}_${sanitizedStoreId}_${nextNumber}"
             println("🔍 DEBUG: Generated ticket number: $ticketNumber")
             return ticketNumber
         } catch (e: Exception) {
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 db889af..e54efd7 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
@@ -2824,6 +2824,13 @@ if (existingRecords.isNotEmpty()) {
                 println("⚠️ Error getting ticket number for pick order $pickOrderId: ${e.message}")
                 ""
             }
+            val dpoStoreId = try {
+                val doPickOrders = doPickOrderRepository.findByPickOrderId(pickOrderId)
+                doPickOrders.firstOrNull()?.storeId ?: ""
+            } catch (e: Exception) {
+                println("⚠️ Error getting storeId for pick order $pickOrderId: ${e.message}")
+                ""
+            }
             val result = mapOf(
                 "pickOrderId" to (pickOrder.id ?: 0L),
                 "pickOrderCode" to (pickOrder.code ?: ""),
@@ -2842,6 +2849,7 @@ if (existingRecords.isNotEmpty()) {
                 "truckNo" to (truck?.truckNo ?: ""), // ✅ Use entity property
                 "DepartureTime" to (truck?.departureTime?.toString() ?: ""), 
                 "ticketNo" to ticketNo,
+                "storeId" to dpoStoreId,
                 "qrCodeData" to (pickOrder.id ?: 0L)
             )