From b005b1c2fbbba27cddb88bc70dcec7fea23acf23 Mon Sep 17 00:00:00 2001
From: "Tommy\\2Fi-Staff" <tommy.lu@2fi-solutions.com.hk>
Date: Mon, 13 Apr 2026 22:53:23 +0800
Subject: [PATCH] excel version for stocktakevaiance report, lotlabelprint
 modal show locatioln update

---
 src/app/(main)/report/page.tsx                         |  2 +-
 .../FinishedGoodSearch/GoodPickExecutiondetail.tsx     |  2 +-
 src/components/InventorySearch/LotLabelPrintModal.tsx  | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/report/page.tsx b/src/app/(main)/report/page.tsx
index 992df05..6b1d0ed 100644
--- a/src/app/(main)/report/page.tsx
+++ b/src/app/(main)/report/page.tsx
@@ -504,7 +504,7 @@ export default function ReportPage() {
                   setLoading={setLoading}
                   reportTitle={currentReport.title}
                 />
-              ) : currentReport.id === 'rep-013' || currentReport.id === 'rep-009' ? (
+              ) : currentReport.id === 'rep-013' || currentReport.id === 'rep-009' || currentReport.id === 'rep-012' ? (
                 <>
                   <Button
                     variant="contained"
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
index 2ea2000..6aaef7e 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
@@ -5054,7 +5054,7 @@ const PickExecution: React.FC<Props> = ({
             setLotLabelPrintReminderText(null);
           }}
           initialPayload={lotLabelPrintInitialPayload}
-          defaultPrinterName="Label機 2F 大堂"
+          defaultPrinterName="Label機 2F A+B"
           hideScanSection
           reminderText={lotLabelPrintReminderText ?? undefined}
         />
diff --git a/src/components/InventorySearch/LotLabelPrintModal.tsx b/src/components/InventorySearch/LotLabelPrintModal.tsx
index 681e17d..1a7c530 100644
--- a/src/components/InventorySearch/LotLabelPrintModal.tsx
+++ b/src/components/InventorySearch/LotLabelPrintModal.tsx
@@ -51,12 +51,16 @@ type QrCodeAnalysisResponse = {
     stockInLineId: number;
     lotNo: string;
     inventoryLotLineId: number;
+    warehouseCode?: string | null;
+    warehouseName?: string | null;
   };
   sameItemLots: Array<{
     lotNo: string;
     inventoryLotLineId: number;
     availableQty: number;
     uom: string;
+    warehouseCode?: string | null;
+    warehouseName?: string | null;
   }>;
 };
 
@@ -513,6 +517,7 @@ const LotLabelPrintModal: React.FC<LotLabelPrintModalProps> = ({
                   {availableLots.map((lot) => {
                     const isPrinting =
                       printingLotLineId === lot.inventoryLotLineId;
+                    const loc = String(lot.warehouseCode ?? "").trim();
                     return (
                       <Box
                         key={lot.inventoryLotLineId}
@@ -537,9 +542,12 @@ const LotLabelPrintModal: React.FC<LotLabelPrintModalProps> = ({
                             Lot：{lot.lotNo}
                             {lot._scanned ? "（已掃）" : ""}
                           </Typography>
+                          <Typography variant="body2" color="text.secondary">
+                            位置：{loc || "—"}
+                          </Typography>
                           <Typography variant="body2" color="text.secondary">
                             可用量：{Number(lot.availableQty).toLocaleString()}{" "}
-                            {lot.uom || ""}
+                            單位：{lot.uom || ""}
                           </Typography>
                         </Box>
                         <Box sx={{ ml: "auto" }}>