From c06ee2e54350b3f326289d44865fbbd2128bc062 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Sat, 7 Feb 2026 17:54:16 +0800
Subject: [PATCH] update

---
 .../Jodetail/JobPickExecutionsecondscan.tsx       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/Jodetail/JobPickExecutionsecondscan.tsx b/src/components/Jodetail/JobPickExecutionsecondscan.tsx
index 10471f1..823f79c 100644
--- a/src/components/Jodetail/JobPickExecutionsecondscan.tsx
+++ b/src/components/Jodetail/JobPickExecutionsecondscan.tsx
@@ -31,7 +31,8 @@ import {
   updateSecondQrScanStatus,
   submitSecondScanQuantity,
   recordSecondScanIssue,
-  unAssignJobOrderPickOrder
+  unAssignJobOrderPickOrder,
+  fetchJobOrderLotsHierarchicalByPickOrderId
 } from "@/app/api/jo/actions";
 import { fetchNameList, NameList } from "@/app/api/user/actions";
 import {
@@ -413,7 +414,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBack }) => {
       console.log(" fetchJobOrderData called with userId:", userIdToUse);
       
       if (!userIdToUse) {
-        console.warn("⚠️ No userId available, skipping API call");
+        console.warn("No userId available, skipping API call");
         setJobOrderData(null);
         setCombinedLotData([]);
         setOriginalCombinedData([]);
@@ -598,6 +599,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBack }) => {
           lot.itemId,
           {
             qty: submitQty,
+            userId: currentUserId !!,
             isMissing: false,
             isBad: false,
             reason: undefined
@@ -609,7 +611,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBack }) => {
       
       const results = await Promise.all(submitPromises);
       const successCount = results.filter(r => r.success).length;
-      
+ 
       console.log(` Batch submit completed: ${successCount}/${scannedLots.length} items submitted`);
       
       await fetchJobOrderData();
@@ -692,10 +694,11 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBack }) => {
         const result = await updateSecondQrScanStatus(
           matchingLot.pickOrderId, 
           matchingLot.itemId,
-          currentUserId || 0,
+          currentUserId !!,
           matchingLot.requiredQty || 1
         );
-        
+        console.log("result", result);
+        console.log("currentUserId", currentUserId);
         if (result.code === "SUCCESS") {
           successCount++;
           setProcessedQrCodes(prev => new Set(prev).add(itemKey));
@@ -1305,7 +1308,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBack }) => {
                                   const submitQty = lot.requiredQty || lot.pickOrderLineRequiredQty;
                                   handlePickQtyChange(lotKey, submitQty);
                                   handleSubmitPickQtyWithQty(lot, submitQty);
-                                  updateSecondQrScanStatus(lot.pickOrderLineId, lot.lotId, currentUserId || 0, submitQty);
+                                  updateSecondQrScanStatus(lot.pickOrderId, lot.itemId, currentUserId || 0, submitQty);
                                 }}
                                 disabled={
                                   //lot.matchStatus !== 'scanned' ||