From 757b8e51efc2222eef5c2c87cdb169167ff65ad3 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Wed, 8 Oct 2025 10:21:36 +0800
Subject: [PATCH] update

---
 .../deliveryOrder/service/DeliveryOrderService.kt     |  1 +
 .../deliveryOrder/service/DoPickOrderService.kt       | 11 ++++-------
 .../modules/pickOrder/service/PickOrderService.kt     |  7 +++++--
 3 files changed, 10 insertions(+), 9 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 d3c7b72..8e12d8a 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
@@ -512,6 +512,7 @@ val doPickOrderRecord = DoPickOrderRecord(
     truckDepartureTime = truck?.departureTime,
     shopId = deliveryOrder.shop?.id,
     handledBy = null,
+    doOrderId = deliveryOrder.id,
     // ✅ 填充新增字段
     truckLanceCode = truck?.truckLanceCode,
     shopCode = deliveryOrder.shop?.code,
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 ef2e050..d431423 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
@@ -104,7 +104,7 @@ class DoPickOrderService(
             doPickOrders.forEach { 
                 it.handledBy = userId
                 it.ticketStatus = DoPickOrderStatus.released
-                it.ticketReleaseTime = LocalDateTime.now() // ✅ Set ticket release time when assigning to user
+                it.ticketReleaseTime = LocalDateTime.now() // ✅ 设置 release time
             }
             return doPickOrderRepository.saveAll(doPickOrders)
         }
@@ -122,11 +122,8 @@ class DoPickOrderService(
     fun removeDoPickOrdersForPickOrder(pickOrderId: Long): Int {
         val doPickOrders = doPickOrderRepository.findByPickOrderId(pickOrderId)
         if (doPickOrders.isNotEmpty()) {
-            // Mark as deleted instead of physically deleting
-            doPickOrders.forEach { 
-                it.ticketStatus = DoPickOrderStatus.completed
-                it.deleted = true }
-            doPickOrderRepository.saveAll(doPickOrders)
+            // ✅ 物理删除记录
+            doPickOrderRepository.deleteAll(doPickOrders)
             return doPickOrders.size
         }
         return 0
@@ -142,7 +139,7 @@ class DoPickOrderService(
         doPickOrderRecords.forEach { 
             it.handledBy = userId
             it.ticketStatus = DoPickOrderStatus.released
-            it.ticketReleaseTime = LocalDateTime.now()
+            it.ticketReleaseTime = LocalDateTime.now()  // ✅ 设置 release time
         }
         return doPickOrderRecordRepository.saveAll(doPickOrderRecords)
     }
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 ffa09da..ab6f6b2 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
@@ -1766,6 +1766,7 @@ open fun autoAssignAndReleasePickOrderByStoreAndTicket(storeId: String, ticketNo
             existingRecords.forEach { record ->
                 record.handledBy = user.id
                 record.ticketStatus = DoPickOrderStatus.released
+                record.ticketReleaseTime = LocalDateTime.now()  // ✅ 添加这行
                 println("🔍 DEBUG: Updating existing DoPickOrderRecord ID: ${record.id} - handledBy: ${user.id}, status: released")
             }
             doPickOrderRecordRepository.saveAll(existingRecords)
@@ -2406,6 +2407,7 @@ open fun autoAssignAndReleasePickOrderByStoreAndTicket(storeId: String, ticketNo
                     existingRecords.forEach { record ->
                         record.handledBy = user.id
                         record.ticketStatus = DoPickOrderStatus.released
+                        record.ticketReleaseTime = LocalDateTime.now()  // ✅ 设置 release time
                         // ✅ 填充新字段
                         record.truckLanceCode = truck?.truckLanceCode
                         record.shopCode = deliveryOrder.shop?.code
@@ -2446,8 +2448,9 @@ open fun autoAssignAndReleasePickOrderByStoreAndTicket(storeId: String, ticketNo
             }
             
             doPickOrderService.updateHandledByForPickOrder(selected.id!!, user.id!!)
-            println("✅ Updated DoPickOrder handledBy to user $userId for pick order ${selected.id}")
-            
+            doPickOrderService.updateRecordHandledByForPickOrder(selected.id!!, user.id!!)  // ✅ 添加这行
+            println("✅ Updated DoPickOrder and DoPickOrderRecord handledBy to user $userId for pick order ${selected.id}")
+
             return MessageResponse(
                 id = null,
                 name = "Pick order assigned",