From 9897375537dda0d41569376a929506a187c0ecf9 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Tue, 20 Oct 2026 12:23:43 +0800
Subject: [PATCH] scan pick block

---
 .../WorkbenchGoodPickExecutionDetail.tsx      |  2 ++
 .../JoWorkbench/newJobPickExecution.tsx       | 36 ++++++++++++++++---
 src/i18n/zh/stockTake.json                    |  2 +-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx b/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
index 91578a07..23fcb11a 100644
--- a/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
+++ b/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
@@ -3466,8 +3466,10 @@ const handleSubmitPickQtyWithQty = useCallback(async (lot: any, submitQty: numbe
     
   } catch (error) {
     console.error("Error submitting pick quantity:", error);
+    const message = error instanceof Error ? error.message.trim() : "";
     setQrScanError(true);
     setQrScanSuccess(false);
+    if (message) setQrScanErrorMsg(message);
   } finally {
     if (solId > 0) setActionBusyBySolId(prev => ({ ...prev, [solId]: false }));
   }
diff --git a/src/components/JoWorkbench/newJobPickExecution.tsx b/src/components/JoWorkbench/newJobPickExecution.tsx
index e62f9d5a..36759efa 100644
--- a/src/components/JoWorkbench/newJobPickExecution.tsx
+++ b/src/components/JoWorkbench/newJobPickExecution.tsx
@@ -3313,8 +3313,10 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
         }, 1000);
       } catch (error) {
         console.error("Error submitting pick quantity:", error);
+        const message = error instanceof Error ? error.message.trim() : "";
         setQrScanError(true);
         setQrScanSuccess(false);
+        if (message) setQrScanErrorMsg(message);
       } finally {
         if (solId > 0)
           setActionBusyBySolId((prev) => ({ ...prev, [solId]: false }));
@@ -4074,6 +4076,11 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
                           : lockedSubmitQtyDisplay;
                           const totalAvail = Number(lot.itemTotalAvailableQty ?? 0);
                           const isLastLotUnavailable = Number.isFinite(totalAvail) && totalAvail === 0;
+                          const rejectDisplay = buildLotRejectDisplayMessage(
+                            lot,
+                            scanRejectMessageBySolId,
+                            tPick,
+                          );
                       return (
                         <TableRow
                           key={`${lot.pickOrderLineId}-${lot.lotId}`}
@@ -4188,16 +4195,35 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
                                     </>
                      
                                   ) : (
-                                    lot.lotNo
+                                    <>
+                                      {lot.lotNo}
+                                      {rejectDisplay ? (
+                                        <Box
+                                          component="span"
+                                          sx={{
+                                            display: "block",
+                                            mt: 0.5,
+                                            color: "error.main",
+                                            fontSize: "0.85rem",
+                                            lineHeight: 1.4,
+                                            whiteSpace: "normal",
+                                            wordBreak: "break-word",
+                                          }}
+                                        >
+                                          {rejectDisplay}
+                                        </Box>
+                                      ) : null}
+                                    </>
                                   )
                                 ) : (
                                   <Box
                                     component="span"
-                                    sx={{ fontSize: "0.85rem", lineHeight: 1.4 }}
+                                    sx={{ fontSize: "0.85rem", lineHeight: 1.4, color: rejectDisplay ? "error.main" : undefined }}
                                   >
-                                    {t(
-                                      "Please check around have QR code or not, may be have just now stock in or transfer in or transfer out.",
-                                    )}
+                                    {rejectDisplay ||
+                                      t(
+                                        "Please check around have QR code or not, may be have just now stock in or transfer in or transfer out.",
+                                      )}
                                   </Box>
                                 )}
                               </Typography>
diff --git a/src/i18n/zh/stockTake.json b/src/i18n/zh/stockTake.json
index d2d2bc47..88949d11 100644
--- a/src/i18n/zh/stockTake.json
+++ b/src/i18n/zh/stockTake.json
@@ -75,7 +75,7 @@
   "UOM": "單位",
   "Stock Take Qty(include Bad Qty)= Available Qty": "盤點數",
   "Record Status": "盤點狀態",
-  "No data": "本月尚未有t任何盤點記錄",
+  "No data": "本月尚未有任何盤點記錄",
   "Difference": "差異",
   "First": "第一次",
   "Second": "第二次",