From fe4bf0b1019b0ed9b8b26c9d77cca73517306933 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Wed, 21 May 2025 16:15:44 +0800
Subject: [PATCH] Quick update for mock up

---
 src/app/(main)/scheduling/rough/edit/page.tsx |   2 +-
 src/components/Breadcrumb/Breadcrumb.tsx      |   2 +-
 .../RoughScheduleDetail/DetailInfoCard.tsx    |   6 +-
 .../RoughScheudleDetailView.tsx               |   4 +-
 .../RoughScheduleDetail/ViewByBomDetails.tsx  | 286 +++++++------
 .../RoughScheduleDetail/ViewByFGDetails.tsx   | 404 +++++++++---------
 .../SearchResults/TempInputGridForMockUp.tsx  |   8 +-
 7 files changed, 370 insertions(+), 342 deletions(-)

diff --git a/src/app/(main)/scheduling/rough/edit/page.tsx b/src/app/(main)/scheduling/rough/edit/page.tsx
index 549a932..efaff8f 100644
--- a/src/app/(main)/scheduling/rough/edit/page.tsx
+++ b/src/app/(main)/scheduling/rough/edit/page.tsx
@@ -28,7 +28,7 @@ const roughSchedulingDetail: React.FC = async () => {
                 rowGap={2}
             >
                 <Typography variant="h4" marginInlineEnd={2}>
-                    {t("Demand Forecast Detail")}
+                    {t("FG & Material Demand Forecast Detail")}
                 </Typography>
                 {/* <Button
           variant="contained"
diff --git a/src/components/Breadcrumb/Breadcrumb.tsx b/src/components/Breadcrumb/Breadcrumb.tsx
index 6f3cf6a..3593335 100644
--- a/src/components/Breadcrumb/Breadcrumb.tsx
+++ b/src/components/Breadcrumb/Breadcrumb.tsx
@@ -15,7 +15,7 @@ const pathToLabelMap: { [path: string]: string } = {
   "/settings/qcItem": "Qc Item",
   "/settings/rss": "Demand Forecast Setting",
   "/scheduling/rough": "Demand Forecast",
-  "/scheduling/rough/edit": "Demand Forecast Detail",
+  "/scheduling/rough/edit": "FG & Material Demand Forecast Detail",
   "/scheduling/detail": "Detail Scheduling",
 };
 
diff --git a/src/components/RoughScheduleDetail/DetailInfoCard.tsx b/src/components/RoughScheduleDetail/DetailInfoCard.tsx
index ec3848b..773a12b 100644
--- a/src/components/RoughScheduleDetail/DetailInfoCard.tsx
+++ b/src/components/RoughScheduleDetail/DetailInfoCard.tsx
@@ -50,9 +50,9 @@ const DetailInfoCard: React.FC<Props> = ({ recordDetails, isEditing}) => {
     <Card sx={{ display: "block" }}>
       <CardContent component={Stack} spacing={4}>
         <Box>
-          <Typography variant="overline" display="block" marginBlockEnd={1}>
+          {/* <Typography variant="overline" display="block" marginBlockEnd={1}>
             {t("Schedule Detail")}
-          </Typography>
+          </Typography> */}
           <Grid container spacing={2} columns={{ xs: 6, sm: 12 }}>
             <Grid item xs={6}>
               <TextField
@@ -82,7 +82,7 @@ const DetailInfoCard: React.FC<Props> = ({ recordDetails, isEditing}) => {
             </Grid>
             <Grid item xs={6}>
               <TextField
-                  label={t("Total Estimated Production Count")}
+                  label={t("Total Estimated Demand Count")}
                   fullWidth
                   {...register("productionCount", {
                     required: "type required!",
diff --git a/src/components/RoughScheduleDetail/RoughScheudleDetailView.tsx b/src/components/RoughScheduleDetail/RoughScheudleDetailView.tsx
index b989fd4..e7862f0 100644
--- a/src/components/RoughScheduleDetail/RoughScheudleDetailView.tsx
+++ b/src/components/RoughScheduleDetail/RoughScheudleDetailView.tsx
@@ -173,8 +173,8 @@ const RoughScheduleDetailView: React.FC<Props> = ({
 
 
         <Tabs value={tabIndex} onChange={handleTabChange} variant="scrollable">
-        <Tab label={t("View By Schedule")} iconPosition="end"/>
-        <Tab label={t("View By Material")} iconPosition="end" />
+        <Tab label={t("View By FG") + (tabIndex === 0 ? " (Selected)" : "")} iconPosition="end"/>
+        <Tab label={t("View By Material") + (tabIndex === 1 ? " (Selected)" : "")} iconPosition="end" />
         </Tabs>
           {serverError && (
             <Typography variant="body2" color="error" alignSelf="flex-end">
diff --git a/src/components/RoughScheduleDetail/ViewByBomDetails.tsx b/src/components/RoughScheduleDetail/ViewByBomDetails.tsx
index 87da605..9c92f02 100644
--- a/src/components/RoughScheduleDetail/ViewByBomDetails.tsx
+++ b/src/components/RoughScheduleDetail/ViewByBomDetails.tsx
@@ -43,6 +43,7 @@ export type FGOverallRecord = {
     id: string | number
     code: string;
     name: string;
+    type: string;
     inStockQty: number;
     purchaseQty: number;
     purchaseQty1: number;
@@ -79,130 +80,130 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
     const fakeRecords = useMemo<FGRecord[][]>(
         () => [
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
             [
-                { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
-                { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
-                { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
-                { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
-                { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
-                { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
-                { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-                { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-                { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-                { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-                { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-                { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-                { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-                { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-                { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 972.12 },
+                { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2 },
+                { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90 },
+                { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4 },
+                { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 66.45 },
+                { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 78.55 },
+                { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+                { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+                { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+                { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+                { id: 11, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+                { id: 12, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+                { id: 13, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+                { id: 14, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                { id: 15, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                { id: 16, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
             ],
         ],
         []
@@ -210,46 +211,46 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const fakeOverallRecords = useMemo<FGOverallRecord[]>(
         () => [
-            { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 ,
+            { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 ,
                 purchaseQty1: 972.12, purchaseQty2: 972.12, purchaseQty3: 972.12,
                 purchaseQty4: 972.12, purchaseQty5: 972.12, purchaseQty6: 972.12,
                 purchaseQty7: 972.12, overallPurchaseQty: 6804.84
             },
-            { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty: 317.52 ,
+            { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty: 317.52 ,
                 purchaseQty1: 3175.2, purchaseQty2: 3175.2, purchaseQty3: 3175.2,
                 purchaseQty4: 3175.2, purchaseQty5: 3175.2, purchaseQty6: 3175.2,
                 purchaseQty7: 3175.2, overallPurchaseQty: 22226.4
             },
-            { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 ,
+            { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 ,
                 purchaseQty1: 90, purchaseQty2: 90, purchaseQty3: 90,
                 purchaseQty4: 90, purchaseQty5: 90, purchaseQty6: 90,
                 purchaseQty7: 90, overallPurchaseQty: 630
             },
-            { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 ,
+            { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 ,
                 purchaseQty1: 60.4, purchaseQty2: 60.4, purchaseQty3: 60.4,
                 purchaseQty4: 60.4, purchaseQty5: 60.4, purchaseQty6: 60.4,
                 purchaseQty7: 60.4, overallPurchaseQty: 422.8
             },
-            { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 ,
+            { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 ,
                 purchaseQty1: 66.45, purchaseQty2: 66.45, purchaseQty3: 66.45,
                 purchaseQty4: 66.45, purchaseQty5: 66.45, purchaseQty6: 66.45,
                 purchaseQty7: 66.45, overallPurchaseQty: 465.15
             },
-            { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 ,
+            { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 ,
                 purchaseQty1: 78.55, purchaseQty2: 78.55, purchaseQty3: 78.55,
                 purchaseQty4: 78.55, purchaseQty5: 78.55, purchaseQty6: 78.55,
                 purchaseQty7: 78.55, overallPurchaseQty: 549.85
             },
-            { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
-            { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
-            { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
-            { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
-            { id: 11, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
-            { id: 12, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
-            { id: 13, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
-            { id: 14, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-            { id: 15, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
-            { id: 16, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+            { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8 },
+            { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 0 },
+            { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2 },
+            { id: 10, code: "PP1096", type: "Material",  name: "白麵撈", inStockQty:  60.00 , purchaseQty: 0 },
+            { id: 11, code: "NA0476", type: "Material",  name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000 },
+            { id: 12, code: "MH0040",type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 972.12  },
+            { id: 13, code: "FA0161",type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 28.15  },
+            { id: 14, code: "MG1288", type: "Material",name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+            { id: 15, code: "MG0066", type: "Material",name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+            { id: 16, code: "MH0040", type: "Material",name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
         ],
         []
     );
@@ -316,20 +317,26 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const overallColumns = useMemo<Column<any>[]>(
         () => [
+            {
+                field: "code",
+                label: "code",
+                type: 'read-only',
+                // editable: true,
+            },
             {
                 field: "name",
                 label: t("name"),
                 type: 'read-only',
             },
             {
-                field: "code",
-                label: "code",
+                field: "type",
+                label: "type",
                 type: 'read-only',
                 // editable: true,
             },
             {
                 field: "inStockQty",
-                label: "In Stock Amount",
+                label: t("Available Qty"),
                 type: 'read-only',
                 renderCell: (row: FGOverallRecord) => {
                     if (typeof(row.inStockQty) == "number") {
@@ -432,20 +439,25 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const columns = useMemo<Column<any>[]>(
         () => [
+            {
+                field: "code",
+                label: "code",
+                type: 'read-only',
+                // editable: true,
+            },
             {
                 field: "name",
                 label: "name",
                 type: 'read-only',
             },
             {
-                field: "code",
-                label: "code",
+                field: "type",
+                label: "type",
                 type: 'read-only',
-                // editable: true,
             },
             {
                 field: "inStockQty",
-                label: "In Stock Amount",
+                label: "Available Qty",
                 type: 'read-only',
                 // editable: true,
                 renderCell: (row: FGRecord) => {
@@ -474,7 +486,7 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
         <Grid container spacing={2}>
             <Grid item xs={12} key={"all"}>
                 <Typography variant="overline" display="block" marginBlockEnd={1}>
-                    Overall
+                    {t("Material Demand List (7 Days)")}
                 </Typography>
                 <EditableSearchResults<FGRecord>
                     index={7}
@@ -491,7 +503,7 @@ const ViewByBomDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             {dayPeriod.map((date, index) => (
                 <Grid item xs={12} key={index}>
                     <Typography variant="overline" display="block" marginBlockEnd={1}>
-                        {date}
+                        {`${t("Material Demand Date")}: ${date}`}
                     </Typography>
                     <EditableSearchResults<FGRecord>
                         index={index}
diff --git a/src/components/RoughScheduleDetail/ViewByFGDetails.tsx b/src/components/RoughScheduleDetail/ViewByFGDetails.tsx
index b7c2d47..8624834 100644
--- a/src/components/RoughScheduleDetail/ViewByFGDetails.tsx
+++ b/src/components/RoughScheduleDetail/ViewByFGDetails.tsx
@@ -19,7 +19,7 @@ import { QcChecksInputs } from "@/app/api/settings/qcCheck/actions";
 import { GridApiCommunity } from "@mui/x-data-grid/internals";
 import { RiceBowl } from "@mui/icons-material";
 import EditableSearchResults, {Column} from "@/components/SearchResults/EditableSearchResults";
-import { decimalFormatter } from "@/app/utils/formatUtil";
+import { decimalFormatter, integerFormatter } from "@/app/utils/formatUtil";
 
 type Props = {
     apiRef: MutableRefObject<GridApiCommunity>
@@ -100,162 +100,162 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
     const fakeRecords = useMemo<FGRecord[][]>(
         () => [
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
@@ -300,82 +300,82 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
                 },
             ],
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
             [
-                { id: 1, code: "PP1080", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
+                { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", inStockQty: 2400, productionQty: 1200.0,
                     lines: [
-                        { id: 1,  code:  "MH0040", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
-                        { id: 2,  code:  "GI3236", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
-                        { id: 3,  code:  "MG1700", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
-                        { id: 4,  code:  "FA0533", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
-                        { id: 5,  code:  "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
-                        { id: 6,  code:  "FA0608", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
-                        { id: 7,  code:  "FA0056", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
-                        { id: 8,  code:  "PP1188", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
-                        { id: 9,  code:  "PP8001", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
-                        { id: 10, code: "PP1096", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
-                        { id: 10, code: "NA0476", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
+                        { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  0 , purchaseQty:  108.88  },
+                        { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty:  635.04  },
+                        { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty:  18.00  },
+                        { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty:  12.08  },
+                        { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  12.08  },
+                        { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  0 , purchaseQty:  12.08  },
+                        { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty:  483.96  },
+                        { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty:  72.00  },
+                        { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty:  154.84  },
+                        { id: 10, code: "PP1096", type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty:  120.00  },
+                        { id: 10, code: "NA0476", type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty:  200.0  },
                     ]
                 },
-                { id: 2, code: "PP1193", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
+                { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", inStockQty: 1322, productionQty: 661,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20  },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10  }
                     ]
                 },
-                { id: 3, code: " PP1188", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
+                { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", inStockQty: 1016.2, productionQty: 508.1,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
-                        { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
-                        { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
-                        { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72   },
+                        { id: 2, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 3, code: "FA0608", type: "Material", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15   },
+                        { id: 4, code: "MG1288", type: "Material", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 5, code: "FA0210", type: "Material", name: "薑茸", inStockQty: 0, purchaseQty:  6.05   },
+                        { id: 6, code: "MG0066", type: "Material", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98   },
                     ]
                 },
-                { id: 4, code: " PP1096", name: "白麵撈", inStockQty: 1040, productionQty: 520,
+                { id: 4, code: " PP1096", type: "FG", name: "白麵撈", inStockQty: 1040, productionQty: 520,
                     lines: [
-                        { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
-                        { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
-                        { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                        { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00  },
+                        { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00  },
+                        { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                     ]
                 },
             ],
@@ -445,20 +445,26 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const columns = useMemo<Column<any>[]>(
         () => [
+            {
+                field: "code",
+                label: "code",
+                type: 'read-only',
+                // editable: true,
+            },
             {
                 field: "name",
                 label: "name",
                 type: 'read-only',
             },
             {
-                field: "code",
-                label: "code",
+                field: "type",
+                label: "type",
                 type: 'read-only',
                 // editable: true,
             },
             {
                 field: "inStockQty",
-                label: "In Stock Amount",
+                label: "Available Qty",
                 type: 'read-only',
                 // editable: true,
                 renderCell: (row: FGRecord) => {
@@ -470,7 +476,7 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             },
             {
                 field: "productionQty",
-                label: "Production Qty",
+                label: "Demand Qty",
                 type: 'input',
                 renderCell: (row: FGRecord) => {
                     if (typeof(row.productionQty) == "number") {
@@ -485,14 +491,20 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const overallColumns = useMemo<Column<any>[]>(
         () => [
+            {
+                field: "code",
+                label: "code",
+                type: 'read-only',
+                // editable: true,
+            },
             {
                 field: "name",
                 label: "name",
                 type: 'read-only',
             },
             {
-                field: "code",
-                label: "code",
+                field: "type",
+                label: "type",
                 type: 'read-only',
                 // editable: true,
             },
@@ -514,7 +526,7 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             {
                 field: "safetyStock",
                 label: "Safety Stock",
-                type: 'read-only-int',
+                type: 'read-only',
                 style: {
                     textAlign: "center",
                 },
@@ -528,8 +540,8 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             },
             {
                 field: "inStockQty",
-                label: "In Stock Amount",
-                type: 'read-only-int',
+                label: "Available Qty",
+                type: 'read-only',
                 style: {
                     textAlign: "center",
                 },
@@ -543,8 +555,8 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             },
             {
                 field: "productionQty",
-                label: "Production Qty",
-                type: 'read-only-int',
+                label: "Demand Qty (7 Days)",
+                type: 'read-only',
                 style: {
                     textAlign: "right",
                 },
@@ -561,42 +573,42 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
 
     const fakeOverallRecords = useMemo<FGRecord[]>(
         () => [
-            { id: 1, code: "PP1080", name: "咖哩汁", lastMonthAvgStock: 2400, safetyStock: 2400, inStockQty: 2400, productionQty: 8400.0*7,
+            { id: 1, code: "PP1080", type: "FG", name: "咖哩汁", lastMonthAvgStock: 2400, safetyStock: 2400, inStockQty: 2400, productionQty: 8400.0*7,
                 lines: [
-                    { id: 1,  code:  "MH0040",  name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 544.4*7 },
-                    { id: 2,  code:  "GI3236",  name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2*7 },
-                    { id: 3,  code:  "MG1700",  name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90*7 },
-                    { id: 4,  code:  "FA0533",  name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
-                    { id: 5,  code:  "FA0210",  name: "薑茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
-                    { id: 6,  code:  "FA0608",  name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
-                    { id: 7,  code:  "FA0056",  name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8*7 },
-                    { id: 8,  code:  "PP1188",  name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 360*7 },
-                    { id: 9,  code:  "PP8001",  name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2*7 },
-                    { id: 10, code: "PP1096",   name: "白麵撈", inStockQty:  60.00 , purchaseQty: 600*7 },
-                    { id: 10, code: "NA0476",   name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000*7 },
+                    { id: 1,  code:  "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty:  54.44 , purchaseQty: 544.4*7 },
+                    { id: 2,  code:  "GI3236", type: "Material", name: "清水(煮過牛腩)", inStockQty:  317.52 , purchaseQty: 3175.2*7 },
+                    { id: 3,  code:  "MG1700", type: "Material", name: "STERILTOM 意大利茄粒", inStockQty:  9.00 , purchaseQty: 90*7 },
+                    { id: 4,  code:  "FA0533", type: "Material", name: "乾蔥茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
+                    { id: 5,  code:  "FA0210", type: "Material", name: "薑茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
+                    { id: 6,  code:  "FA0608", type: "Material", name: "粗蒜茸", inStockQty:  6.04 , purchaseQty: 60.4*7 },
+                    { id: 7,  code:  "FA0056", type: "Material", name: "洋蔥肉", inStockQty:  241.98 , purchaseQty: 2419.8*7 },
+                    { id: 8,  code:  "PP1188", type: "Material", name: "咖喱膽", inStockQty:  36.00 , purchaseQty: 360*7 },
+                    { id: 9,  code:  "PP8001", type: "Material", name: "咖哩汁箱料粉", inStockQty:  77.42 , purchaseQty: 774.2*7 },
+                    { id: 10, code: "PP1096",  type: "Material", name: "白麵撈", inStockQty:  60.00 , purchaseQty: 600*7 },
+                    { id: 10, code: "NA0476",  type: "Material", name: "2磅份量三邊覆合袋 (0.1x225x260mm)個計", inStockQty:  600.00 , purchaseQty: 6000*7 },
                 ]
             },
-            { id: 2, code: "PP1193", name: "蔥油(1磅) ", lastMonthAvgStock: 1320, safetyStock: 1322, inStockQty: 1322, productionQty: 4627,
+            { id: 2, code: "PP1193", type: "FG", name: "蔥油(1磅) ", lastMonthAvgStock: 1320, safetyStock: 1322, inStockQty: 1322, productionQty: 4627,
                 lines: [
-                    { id: 2, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20*7  },
-                    { id: 3, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10*7  }
+                    { id: 2, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty: 20*7  },
+                    { id: 3, code: "FA0161", type: "Material", name: "洋蔥粒", inStockQty: 0, purchaseQty: 10*7  }
                 ]
             },
-            { id: 3, code: " PP1188", name: "咖喱膽", lastMonthAvgStock: 1017, safetyStock: 1017, inStockQty: 1016.2, productionQty: 3556.7,
+            { id: 3, code: " PP1188", type: "FG", name: "咖喱膽", lastMonthAvgStock: 1017, safetyStock: 1017, inStockQty: 1016.2, productionQty: 3556.7,
                 lines: [
-                    { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72*7   },
-                    { id: 2, code: "FA0161", name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15*7   },
-                    { id: 3, code: "FA0608", name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15*7   },
-                    { id: 4, code: "MG1288", name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05*7   },
-                    { id: 5, code: "FA0210", name: "薑茸", inStockQty: 0, purchaseQty:  6.05*7   },
-                    { id: 6, code: "MG0066", name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98*7   },
+                    { id: 1, code: "MH0040", type: "Material",name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  217.72*7   },
+                    { id: 2, code: "FA0161", type: "Material",name: "洋蔥粒", inStockQty: 0, purchaseQty:  18.15*7   },
+                    { id: 3, code: "FA0608", type: "Material",name: "粗蒜茸", inStockQty: 0, purchaseQty:  18.15*7   },
+                    { id: 4, code: "MG1288", type: "Material",name: "炸紅蔥頭", inStockQty: 0, purchaseQty:  6.05*7   },
+                    { id: 5, code: "FA0210", type: "Material",name: "薑茸", inStockQty: 0, purchaseQty:  6.05*7   },
+                    { id: 6, code: "MG0066", type: "Material",name: "咖哩料(5斤x16包+2斤/包)", inStockQty: 0, purchaseQty:  241.98*7   },
                 ]
             },
-            { id: 4, code: " PP1096", name: "白麵撈", lastMonthAvgStock: 1040, safetyStock: 1040, inStockQty: 1040, productionQty: 3640,
+            { id: 4, code: " PP1096", type: "FG", name: "白麵撈", lastMonthAvgStock: 1040, safetyStock: 1040, inStockQty: 1040, productionQty: 3640,
                 lines: [
-                    { id: 1, code: "MH0040", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00*7  },
-                    { id: 1, code: "MH0040", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00*7  },
-                    { id: 2, code: "FA0161", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
+                    { id: 1, code: "MH0040", type: "Material", name: "大豆油(1噸/桶)", inStockQty: 0, purchaseQty:  190.00*7  },
+                    { id: 1, code: "MH0040", type: "Material", name: "星加坡綠富貴花牌幼白麵粉 (50磅/包)", inStockQty: 0, purchaseQty:  250.00*7  },
+                    { id: 2, code: "FA0161", type: "Material", name: "蔥油", inStockQty: 1322, purchaseQty:  0  },
                 ]
             },
         ],
@@ -607,7 +619,7 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
         <Grid container spacing={2}>
             <Grid item xs={12} key={"all"}>
                 <Typography variant="overline" display="block" marginBlockEnd={1}>
-                    Overall
+                    {t("FG Demand List (7 Days)")}
                 </Typography>
                 <EditableSearchResults<FGRecord>
                     index={7}
@@ -624,7 +636,7 @@ const ViewByFGDetails: React.FC<Props> = ({ apiRef, isEdit }) => {
             {dayPeriod.map((date, index) => (
                 <Grid item xs={12} key={index}>
                     <Typography variant="overline" display="block" marginBlockEnd={1}>
-                        {date}
+                        {`${t("FG Demand Date")}: ${date}`}
                     </Typography>
                     <EditableSearchResults<FGRecord>
                         items={fakeRecords[index]} // Use the corresponding records for the day
diff --git a/src/components/SearchResults/TempInputGridForMockUp.tsx b/src/components/SearchResults/TempInputGridForMockUp.tsx
index 5cd609c..f406aa6 100644
--- a/src/components/SearchResults/TempInputGridForMockUp.tsx
+++ b/src/components/SearchResults/TempInputGridForMockUp.tsx
@@ -174,9 +174,13 @@ function TempInputGridForMockUp({ stockInLine }: Props) {
         field: "name",
         flex: 1,
       },
+      {
+        field: "type",
+        flex: 1,
+      },
       {
         field: "inStockQty",
-        headerName: "inStockQty",
+        headerName: "Available Qty",
         flex: 0.5,
         type: "number",
         editable: true,
@@ -187,7 +191,7 @@ function TempInputGridForMockUp({ stockInLine }: Props) {
       },
       {
         field: "purchaseQty",
-        headerName: "purchaseQty",
+        headerName: "Demand Qty",
         flex: 0.5,
         editable: true,
         renderCell: (row) => {