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

src/components/Breadcrumb/Breadcrumb.tsx

@@ -17,8 +17,8 @@ const pathToLabelMap: { [path: string]: string } = {
   "/settings/rss": "Demand Forecast Setting",
   "/scheduling/rough": "Demand Forecast",
   "/scheduling/rough/edit": "FG & Material Demand Forecast Detail",
-  "/scheduling/detail": "Detail Scheduling",
-  "/scheduling/detail/edit": "FG Production Schedule",
+  "/scheduling/detailed": "Detail Scheduling",
+  "/scheduling/detailed/edit": "FG Production Schedule",
   "/inventory": "Inventory",
   "/settings/importTesting": "Import Testing",
   "/do": "Delivery Order",

src/components/PickOrderDetail/PickOrderDetail.tsx

@@ -144,17 +144,17 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => {
       // },
       {
         field: "itemName",
-        headerName: "itemId",
+        headerName: t("item"),
         flex: 1,
       },
       {
         field: "qty",
-        headerName: "qty",
+        headerName: t("qty"),
         flex: 1,
       },
       {
         field: "uom",
-        headerName: "uom",
+        headerName: t("uom"),
         flex: 1,
       },
       // {
@@ -164,7 +164,7 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => {
       // },
       {
         field: "warehouse",
-        headerName: "location",
+        headerName: t("location"),
         flex: 1,
         renderCell: (params) => {
           // console.log(params.row.warehouse)
@@ -181,7 +181,7 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => {
       },
       {
         field: "suggestedLotNo",
-        headerName: "suggestedLotNo",
+        headerName: t("suggestedLotNo"),
         flex: 1.2,
         renderCell: (params) => {
           return params.row.suggestedLotNo;
@@ -387,12 +387,12 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => {
     () => [
       {
         field: "itemName",
-        headerName: "item name",
+        headerName: t("item name"),
         flex: 1,
       },
       {
         field: "qty",
-        headerName: "qty",
+        headerName: t("qty"),
         editable: true,
         flex: 1,
         type: "number",
@@ -416,7 +416,7 @@ const PickOrderDetail: React.FC<Props> = ({ consoCode, qc }) => {
       },
       {
         field: "lotNo",
-        headerName: "lotNo",
+        headerName: t("lotNo"),
         flex: 1,
       },
       {

src/components/PickOrderSearch/CreateForm.tsx

@@ -60,7 +60,7 @@ const CreateForm: React.FC<Props> = ({ items }) => {
   const { 
     t,
     i18n: { language },
-   } = useTranslation("purchaseOrder");
+   } = useTranslation("pickOrder");
   const apiRef = useGridApiRef();
   const {
     formState: { errors, defaultValues, touchedFields },

src/i18n/zh/common.json

@@ -69,6 +69,9 @@
     "Cancel":"取消",
     "Equipment Details":"設備詳情",
     "Exclude Date":"排除日期",
-    "Finished Goods Name":"成品名稱"
+    "Finished Goods Name":"成品名稱",
+    "create": "新增",
 
+    "Job Order": "工單",
+    "Production": "生產流程"
 }

src/i18n/zh/detailScheduling.json

@@ -16,5 +16,6 @@
     "Product Count": "產品數量",
     "Schedule Period": "排程期間",
     "Product": "產品",
-    "Details": "詳情"
+    "Details": "詳情",
+    "types": "類型"
 }

src/i18n/zh/pickOrder.json

@@ -107,5 +107,21 @@
     "Released By": "發佈者",
     "Target Date From": "目標日期從",
     "Target Date To": "目標日期到",
-    "Consolidate": "合併"
+    "Consolidate": "合併",
+
+    "create": "新增",
+    "detail": "詳情",
+    "Pick Order Detail": "提料單詳情",
+    "item": "項目",
+    "reset": "重置",
+    "targetDate": "目標日期",
+    "remove": "移除",
+    "release": "發佈",
+    "location": "位置",
+    "suggestedLotNo": "建議批次",
+    "lotNo": "批次",
+    "item name": "項目名稱",
+    "approval": "審核",
+    "lot change": "批次變更",
+    "checkout": "出庫"
 }