From f3d732c37bfa9d56edf569170b6047824fc74272 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Thu, 9 Oct 2025 12:24:14 +0800
Subject: [PATCH] update

---
 .../jobOrder/service/JoPickOrderService.kt        | 15 +++++++++++++--
 .../modules/pickOrder/service/PickOrderService.kt | 12 +++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
index 47bf62d..0ab4860 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
@@ -968,12 +968,17 @@ open fun submitSecondScanQty(request: SecondScanSubmitRequest): MessageResponse
         val joPickOrderEntity = joPickOrder.get()
         joPickOrderEntity.matchQty = request.qty.toInt()
         
-        // ✅ Always set status to completed when submitting quantity
+        // ✅ Set status to completed when submitting quantity
         joPickOrderEntity.matchStatus = JoPickOrderStatus.completed
         
+        // ✅ 添加：如果 ticketCompleteTime 还没设置，现在设置（通常已经在拣货完成时设置了）
+        if (joPickOrderEntity.ticketCompleteTime == null) {
+            joPickOrderEntity.ticketCompleteTime = LocalDateTime.now()
+        }
+        
         joPickOrderRepository.save(joPickOrderEntity)
         
-        println("✅ Updated jo_pick_order: status=${joPickOrderEntity.matchStatus}, qty=${joPickOrderEntity.matchQty}")
+        println("✅ Updated jo_pick_order: status=${joPickOrderEntity.matchStatus}, qty=${joPickOrderEntity.matchQty}, completeTime=${joPickOrderEntity.ticketCompleteTime}")
         
         return MessageResponse(
             id = null,
@@ -1058,6 +1063,12 @@ open fun recordSecondScanIssue(request: SecondScanIssueRequest): MessageResponse
         val joPickOrderEntity = joPickOrder.get()
         joPickOrderEntity.matchStatus = JoPickOrderStatus.completed
         joPickOrderEntity.matchQty = request.qty.toInt()
+
+        // ✅ 添加：如果 ticketCompleteTime 还没设置，现在设置
+        if (joPickOrderEntity.ticketCompleteTime == null) {
+            joPickOrderEntity.ticketCompleteTime = LocalDateTime.now()
+        }
+
         joPickOrderRepository.save(joPickOrderEntity)
         
         // ✅ Create pick execution issue with complete data
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 5b2da7a..5463689 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
@@ -1229,23 +1229,21 @@ logger.info("Precreated $precreated stock out lines for suggested lots on releas
                             
                             // ✅ 添加：直接使用 Repository 处理 JO pick order（避免循环依赖）
                             if (pickOrder.jobOrder != null) {
-                                // Complete jo_pick_order
                                 val joPickOrders = joPickOrderRepository.findByPickOrderId(pickOrderId)
                                 joPickOrders.forEach { 
-                                    it.matchStatus = JoPickOrderStatus.completed
-                                    it.ticketCompleteTime = LocalDateTime.now()
+                                    it.ticketCompleteTime = LocalDateTime.now() // 记录拣货完成时间
+                                    // match_status 保持为 'pending'，等待二次扫描
                                 }
                                 joPickOrderRepository.saveAll(joPickOrders)
                                 
-                                // Complete jo_pick_order_record
                                 val joPickOrderRecords = joPickOrderRecordRepository.findByPickOrderId(pickOrderId)
                                 joPickOrderRecords.forEach { 
-                                    it.matchStatus = JoPickOrderStatus.completed
-                                    it.ticketCompleteTime = LocalDateTime.now()
+                                    it.ticketCompleteTime = LocalDateTime.now() // 记录拣货完成时间
+                                    // match_status 保持为 'pending'，等待二次扫描
                                 }
                                 joPickOrderRecordRepository.saveAll(joPickOrderRecords)
                                 
-                                println("✅ Updated jo_pick_order and jo_pick_order_record ticketCompleteTime for pick order ${pickOrderId}")
+                                println("✅ Set jo_pick_order ticketCompleteTime for pick order ${pickOrderId}, waiting for second scan")
                             }
                         }
                     }