From 074c7d3a40360e70c889e8063ff81d26bda34632 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Thu, 9 Oct 2025 02:34:17 +0800
Subject: [PATCH] update

---
 .../deliveryOrder/service/DeliveryOrderService.kt        | 2 +-
 .../modules/deliveryOrder/service/DoPickOrderService.kt  | 9 +++++----
 .../fpsms/modules/pickOrder/service/PickOrderService.kt  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
index 8e12d8a..264f0b6 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
@@ -474,7 +474,7 @@ open class DeliveryOrderService(
 
 // ✅ CREATE do_pick_order_record entries
 val targetDate = deliveryOrder.estimatedArrivalDate?.toLocalDate() ?: LocalDate.now()
-val datePrefix = targetDate.format(DateTimeFormatter.ofPattern("ddMMyy"))
+val datePrefix = targetDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"))
 
 println("🔍 DEBUG: Target date: $targetDate, Date prefix: $datePrefix")
 val truck = deliveryOrder.shop?.id?.let { shopId ->
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 d431423..1528b33 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
@@ -45,15 +45,16 @@ class DoPickOrderService(
         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}_${sanitizedStoreId}_"
+            // ✅ 修改搜索模式为新格式
+            val searchPattern = "T-${datePrefix}-${sanitizedStoreId}-"  // T-20250915-4F-
             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}")
+                println("🔍 DEBUG: Existing ticket: ${ticket.ticketNo}, Status: ${ticket.ticketStatus}")
             }
             val nextNumber = (todayTickets.size + 1).toString().padStart(3, '0')
-            val ticketNumber = "${datePrefix}_${sanitizedStoreId}_${nextNumber}"
+            // ✅ 修改生成格式
+            val ticketNumber = "T-${datePrefix}-${sanitizedStoreId}-${nextNumber}"  // T-20250915-4F-001
             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 249fb1f..5b2da7a 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
@@ -2397,7 +2397,7 @@ open fun autoAssignAndReleasePickOrderByStoreAndTicket(storeId: String, ticketNo
             val deliveryOrder = selected.deliveryOrder
             if (deliveryOrder != null) {
                 val targetDate = deliveryOrder.estimatedArrivalDate?.toLocalDate() ?: LocalDate.now()
-                val datePrefix = targetDate.format(DateTimeFormatter.ofPattern("ddMMyy"))
+                val datePrefix = targetDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"))
                 
                 println("🔍 DEBUG: Target date: $targetDate, Date prefix: $datePrefix")