Merge branch 'master' of https://git.2fi-solutions.com/derek/FPSMS-frontend

# Conflicts:
#	src/components/FinishedGoodSearch/FinishedGoodFloorLanePanel.tsx

src/components/FinishedGoodSearch/GoodPickExecution.tsx

@@ -965,6 +965,7 @@ return (
         onPickOrderAssigned={() => {
           if (currentUserId) {
             fetchAllCombinedLotData(currentUserId);
+            fetchFgPickOrdersData();
           }
         }} 
       />

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": "請選擇日期"
     }