From 744d6d8429a907e70f3fa95a939b248de790423b Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Thu, 16 Oct 2025 16:12:11 +0800
Subject: [PATCH 1/2] quick fix translation

---
 .../FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx         | 3 ++-
 src/i18n/zh/do.json                                           | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx b/src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx
index b33b279..5033768 100644
--- a/src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx
+++ b/src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx
@@ -126,7 +126,8 @@ const FinishedGoodFloorLanePanel: React.FC<Props> = ({ onPickOrderAssigned }) =>
             id="date-select"
             value={selectedDate}
             label={t("Select Date")}
-            onChange={(e) => setSelectedDate(e.target.value)}
+            
+            onChange={(e) => { setSelectedDate(e.target.value)}}
           >
             <MenuItem value="today">
               {t("Today")} ({getDateLabel(0)})
diff --git a/src/i18n/zh/do.json b/src/i18n/zh/do.json
index a595912..e21ebc7 100644
--- a/src/i18n/zh/do.json
+++ b/src/i18n/zh/do.json
@@ -55,7 +55,5 @@
     "Pick Order Assignment": "提料單分配",
     "Release 2/F": "放單2/F",
     "Release 4/F": "放單4/F",
-    "Stock Status": "庫存狀態",
-    "Finished: ": "已放送貨訂單：",
-    "Total:": "已選擇送貨訂單："
+    "Stock Status": "庫存狀態"
 }
\ No newline at end of file

From 80b3f441751c3fe8ef9b79681915fb69095e045e Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Thu, 16 Oct 2025 16:46:50 +0800
Subject: [PATCH 2/2] Merge branch 'master' of
 https://git.2fi-solutions.com/derek/FPSMS-frontend

# Conflicts:
#	src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx
---
 .../FinishedGoodSearch/GoodPickExecution.tsx     |  1 +
 src/i18n/zh/pickOrder.json                       | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/FinishedGoodSearch/GoodPickExecution.tsx b/src/components/FinishedGoodSearch/GoodPickExecution.tsx
index 1aa1d85..1f54bcc 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecution.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecution.tsx
@@ -965,6 +965,7 @@ return (
         onPickOrderAssigned={() => {
           if (currentUserId) {
             fetchAllCombinedLotData(currentUserId);
+            fetchFgPickOrdersData();
           }
         }} 
       />
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index f277eef..00df638 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -113,13 +113,13 @@
         "Items": "項目",
         "Target Date": "需求日期",
         "Released By": "發佈者",
-        "Target Date From": "目標日期從",
+        "Target Date From": "目標日期",
         "Target Date To": "目標日期到",
         "Consolidate": "合併",
         "Stock Unit": "庫存單位",
         "create": "新增",
         "detail": "詳情",
-        "Pick Order Detail": "提料單詳情",
+        "Pick Order Detail": "撳單/提料單詳情",
         "item": "貨品",
         "Unit": "單位",
         "reset": "重置",
@@ -305,8 +305,8 @@
     "All lots must be completed before printing": "所有批次必須完成才能打印",
     "Assigning pick order...": "分配提料單...",
     "Enter the number of cartons:": "請輸入總箱數",
-    "Finished Good Detail": "成品詳情",
-    "Finished Good Record": "成品記錄",
+    "Finished Good Detail": "成品提貨詳情",
+    "Finished Good Record": "成品提貨記錄",
     "Hide Completed: OFF": "完成: OFF",
     "Hide Completed: ON": "完成: ON",
     "Number must be at least 1": "數量至少為1",
@@ -382,6 +382,10 @@
     "Info": "消息",
     "Warning": "警告",
     "Error": "錯誤",
-    "Batch Print": "批量列印"
-
+    "Batch Print": "批量列印",
+    "No entries available": "該樓層未有需處理訂單",
+    "Today": "是日",
+    "Tomorrow": "翌日",
+    "Day After Tomorrow": "後日",
+    "Select Date": "請選擇日期"
     }   
\ No newline at end of file