Merge branch 'master' of http://svn.2fi-solutions.com:8300/derek/FPSMS-frontend

# Conflicts:
#	src/i18n/zh/jo.json

src/i18n/zh/jo.json

@@ -21,6 +21,7 @@
   "completed": "已完成",
   "Completed": "已完成",
   "Cancel": "取消",
+  "Create": "創建",
   "Scan Status": "掃碼狀態",
   "Start Job Order": "開始工單",
   "Target Production Date" : "預計生產日期",
@@ -100,10 +101,13 @@
   "submit": "提交",
   "Issue Remark": "問題描述",
   "Received Qty": "接收數量",
-  "Create": "創建",
   "Confirm Lot Substitution": "確認批號替換",
+<<<<<<< HEAD
   "Processing...": "處理中",
 "Processing...": "處理中",
 "Complete Job Order Record": "已完成工單記錄"
 
+=======
+  "Processing...": "處理中"
+>>>>>>> 1d989c28c1973b644241c9a9586c42897979337e
 }

src/i18n/zh/pickOrder.json

@@ -172,7 +172,7 @@
     "Job Order Code": "工單編號",
     "QC Check": "QC 檢查",
     "QR Code Scan": "QR Code掃描",
-    "Pick Order Details": "提料單資料",
+    "Pick Order Details": "提料單詳情",
     "Partial quantity submitted. Please submit more or complete the order.": "已提料部分數量。請提交更多或完成訂單。",
     "Pick order completed successfully!": "提料單完成成功！",
     "Lot has been rejected and marked as unavailable.": "批號已拒絕並標記為不可用。",
@@ -223,9 +223,6 @@
     "No Group": "沒有分組",
     "Selected items will join above created group": "已選擇的貨品將加入以上建立的分組",
     "Issue":"問題",
-    "issue":"問題",
-    "Processing...":"處理中",
-    "Assigning pick order...":"分派提料單中...",
     "Pick Execution Issue Form":"提料問題表單",
     "This form is for reporting issues only. You must report either missing items or bad items.":"此表單僅用於報告問題。您必須報告缺少的貨品或不良貨品。",
     "Bad item Qty":"不良貨品數量",
@@ -255,16 +252,16 @@
     "Shop Name":"商店名稱",
     "Shop Address":"商店地址",
     "Delivery Date":"目標日期",
-    "Pick Execution 2/F":"取單 2/F",
-    "Pick Execution 4/F":"取單 4/F",
-    "Finished Good Detail":"成品資料",
+    "Pick Execution 2/F":"進行提料 2/F",
+    "Pick Execution 4/F":"進行提料 4/F",
+    "Pick Execution Detail":"進行提料詳情",
     "Submit Required Pick Qty":"提交所需提料數量",
     "Scan Result":"掃描結果",
     "Ticket No.":"提票號碼",
     "Start QR Scan":"開始QR掃描",
     "Stop QR Scan":"停止QR掃描",
     "Scanning...":"掃描中...",
-
+    "Print DN/Label":"列印送貨單/標籤",
     "Store ID":"儲存編號",
     "QR code does not match any item in current orders.":"QR 碼不符合當前訂單中的任何貨品。",
     "Lot Number Mismatch":"批次號碼不符",
@@ -273,28 +270,23 @@
     "Scanned Lot:":"掃描批次：",
     "Confirm":"確認",
     "Update your suggested lot to the this scanned lot":"更新您的建議批次為此掃描的批次",
-    "Print Draft":"列印送貨單草稿",
-    "Print Pick Order and DN Label":"列印送貨單和標貼",
-    "Print Pick Order":"列印送貨單",
-    "Print DN Label":"列印標貼",
+    "Print Draft":"列印草稿",
+    "Print Pick Order and DN Label":"列印提料單和送貨單標貼",
+    "Print Pick Order":"列印提料單",
+    "Print DN Label":"列印送貨單標貼",
     "If you confirm, the system will:":"如果您確認，系統將：",
     "QR code verified.":"QR 碼驗證成功。",
     "Order Finished":"訂單完成",
     "Submitted Status":"提交狀態",
-    "Finished Good Record":"已完成出倉記錄",
+    "Pick Execution Record":"提料執行記錄",
     "Delivery No.":"送貨單編號",
     "Total":"總數",
     "completed DO pick orders":"已完成送貨單提料單",
-    "Delivery No":"送貨單編號",
-    "View Details":"查看詳情",
-    "COMPLETED":"已完成",
-    "FG orders":"成品提料單",
-    "Back to List":"返回列表",
-    "You need to enter a number": "箱數不能為空",
-    "Number must be at least 1": "箱數最少為一",
-    "Printed Successfully.": "已成功列印",
-    "Total exceeds required qty":"總數超出所需數量",
-    "Enter the number of cartons:": "請輸入總箱數"
+    "No completed DO pick orders found":"沒有已完成送貨單提料單",
+
+    "Print DN Label":"列印送貨單標貼",
+    "Enter the number of cartons: ": "請輸入總箱數",
+    "Number of cartons": "箱數"