diff --git a/src/app/(dashboard)/finance/product-master/[productSysId]/detail-client.tsx b/src/app/(dashboard)/finance/product-master/[productSysId]/detail-client.tsx
index 41314e7..236e090 100644
--- a/src/app/(dashboard)/finance/product-master/[productSysId]/detail-client.tsx
+++ b/src/app/(dashboard)/finance/product-master/[productSysId]/detail-client.tsx
@@ -110,9 +110,9 @@ export default function ProductMasterDetailClient({ productSysId }: Props) {
             </div>
             <Field label="Shade" value={product.shadeCode || "—"} />
             <Field label="Grade" value={product.gradeCode || "—"} />
-            <Field label="ERP item" value={product.erpItemCode || "—"} mono />
-            <Field label="ERP grade 1" value={product.erpGradeCode1 || "—"} mono />
-            <Field label="ERP grade 2" value={product.erpGradeCode2 || "—"} mono />
+            <Field label="Oracle Sys ID" value={product.flex02 || "—"} mono />
+            <Field label="ERP Compound Key" value={product.flex01 || "—"} mono />
+            <Field label="Type Label" value={product.flex03 || "—"} />
             {product.description && (
               <div className="col-span-full">
                 <Field label="Description" value={product.description} />
diff --git a/src/app/(dashboard)/finance/product-master/product-master-page-client.tsx b/src/app/(dashboard)/finance/product-master/product-master-page-client.tsx
index 0eebcc2..d8c8cab 100644
--- a/src/app/(dashboard)/finance/product-master/product-master-page-client.tsx
+++ b/src/app/(dashboard)/finance/product-master/product-master-page-client.tsx
@@ -21,11 +21,11 @@ import {
 } from "@/components/ui/select"
 import {
   DeactivateProductMasterDialog,
-  ErpLinkageDialog,
   ProductMasterFormDialog,
   ProductMasterTable,
 } from "@/components/finance/cost-product-master"
 import { BulkImportDialog } from "@/components/finance/costing/bulk-import-dialog"
+import { ParamsOnlyImportDialog } from "@/components/finance/costing/params-only-import-dialog"
 import { ImportDialog } from "@/components/finance/costing/import-dialog"
 import { ProductTypeCombobox } from "@/components/finance/comboboxes"
 import { DataTablePagination } from "@/components/shared"
@@ -51,10 +51,10 @@ export default function ProductMasterPageClient() {
   const router = useRouter()
 
   const [formOpen, setFormOpen] = useState(false)
-  const [erpOpen, setErpOpen] = useState(false)
   const [deactivateOpen, setDeactivateOpen] = useState(false)
   const [importOpen, setImportOpen] = useState(false)
   const [bulkImportOpen, setBulkImportOpen] = useState(false)
+  const [paramsImportOpen, setParamsImportOpen] = useState(false)
   const [editing, setEditing] = useState<CostProductMaster | null>(null)
   const [bulkExportLoading, setBulkExportLoading] = useState(false)
 
@@ -68,10 +68,6 @@ export default function ProductMasterPageClient() {
     setEditing(p)
     setFormOpen(true)
   }
-  function openErp(p: CostProductMaster) {
-    setEditing(p)
-    setErpOpen(true)
-  }
   function openDeactivate(p: CostProductMaster) {
     setEditing(p)
     setDeactivateOpen(true)
@@ -129,6 +125,9 @@ export default function ProductMasterPageClient() {
             <DropdownMenuItem onSelect={() => setBulkImportOpen(true)}>
               Import Produk + Routing (Bulk)
             </DropdownMenuItem>
+            <DropdownMenuItem onSelect={() => setParamsImportOpen(true)}>
+              Import Params Saja (Bulk)
+            </DropdownMenuItem>
           </DropdownMenuContent>
         </DropdownMenu>
 
@@ -205,7 +204,6 @@ export default function ProductMasterPageClient() {
         items={items}
         isLoading={isLoading}
         onEdit={openEdit}
-        onLinkErp={openErp}
         onDeactivate={openDeactivate}
       />
 
@@ -229,13 +227,13 @@ export default function ProductMasterPageClient() {
         }
       />
       <ProductMasterFormDialog open={formOpen} onOpenChange={setFormOpen} product={editing} />
-      <ErpLinkageDialog open={erpOpen} onOpenChange={setErpOpen} product={editing} />
       <DeactivateProductMasterDialog
         open={deactivateOpen}
         onOpenChange={setDeactivateOpen}
         product={editing}
       />
       <BulkImportDialog open={bulkImportOpen} onOpenChange={setBulkImportOpen} />
+      <ParamsOnlyImportDialog open={paramsImportOpen} onOpenChange={setParamsImportOpen} />
     </div>
   )
 }
diff --git a/src/app/api/v1/finance/cost-erp/grades/route.ts b/src/app/api/v1/finance/cost-erp/grades/route.ts
deleted file mode 100644
index b7eb215..0000000
--- a/src/app/api/v1/finance/cost-erp/grades/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NextRequest, NextResponse } from "next/server"
-import { getCostErpClient, createMetadataFromRequest, isGrpcError, handleGrpcError } from "@/lib/grpc"
-
-export async function GET(request: NextRequest) {
-  try {
-    const { searchParams } = new URL(request.url)
-    const metadata = createMetadataFromRequest(request)
-    const client = getCostErpClient()
-    const response = await client.listCostErpGrades(
-      {
-        search: searchParams.get("search") || "",
-        activeFilter: searchParams.get("activeFilter") || searchParams.get("active_filter") || "active",
-        pagination: {
-          page: Number(searchParams.get("page")) || 1,
-          pageSize: Number(searchParams.get("pageSize") || searchParams.get("page_size")) || 50,
-        },
-      },
-      metadata,
-    )
-    return NextResponse.json({ base: response.base, data: response.data, pagination: response.pagination })
-  } catch (error) {
-    if (isGrpcError(error)) return handleGrpcError(error)
-    return NextResponse.json({ base: { isSuccess: false, statusCode: "500", message: "Failed to list ERP grades", validationErrors: [] }, data: [] }, { status: 500 })
-  }
-}
diff --git a/src/app/api/v1/finance/cost-erp/items/route.ts b/src/app/api/v1/finance/cost-erp/items/route.ts
deleted file mode 100644
index 6c09a30..0000000
--- a/src/app/api/v1/finance/cost-erp/items/route.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// CostErpLookup — list items (read-only).
-import { NextRequest, NextResponse } from "next/server"
-import { getCostErpClient, createMetadataFromRequest, isGrpcError, handleGrpcError } from "@/lib/grpc"
-
-export async function GET(request: NextRequest) {
-  try {
-    const { searchParams } = new URL(request.url)
-    const metadata = createMetadataFromRequest(request)
-    const client = getCostErpClient()
-    const response = await client.listCostErpItems(
-      {
-        search: searchParams.get("search") || "",
-        itemType: searchParams.get("itemType") || searchParams.get("item_type") || "",
-        activeFilter: searchParams.get("activeFilter") || searchParams.get("active_filter") || "active",
-        pagination: {
-          page: Number(searchParams.get("page")) || 1,
-          pageSize: Number(searchParams.get("pageSize") || searchParams.get("page_size")) || 50,
-        },
-      },
-      metadata,
-    )
-    return NextResponse.json({ base: response.base, data: response.data, pagination: response.pagination })
-  } catch (error) {
-    if (isGrpcError(error)) return handleGrpcError(error)
-    return NextResponse.json({ base: { isSuccess: false, statusCode: "500", message: "Failed to list ERP items", validationErrors: [] }, data: [] }, { status: 500 })
-  }
-}
diff --git a/src/app/api/v1/finance/cost-erp/shades/route.ts b/src/app/api/v1/finance/cost-erp/shades/route.ts
deleted file mode 100644
index 695ebb6..0000000
--- a/src/app/api/v1/finance/cost-erp/shades/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NextRequest, NextResponse } from "next/server"
-import { getCostErpClient, createMetadataFromRequest, isGrpcError, handleGrpcError } from "@/lib/grpc"
-
-export async function GET(request: NextRequest) {
-  try {
-    const { searchParams } = new URL(request.url)
-    const metadata = createMetadataFromRequest(request)
-    const client = getCostErpClient()
-    const response = await client.listCostErpShades(
-      {
-        search: searchParams.get("search") || "",
-        activeFilter: searchParams.get("activeFilter") || searchParams.get("active_filter") || "active",
-        pagination: {
-          page: Number(searchParams.get("page")) || 1,
-          pageSize: Number(searchParams.get("pageSize") || searchParams.get("page_size")) || 50,
-        },
-      },
-      metadata,
-    )
-    return NextResponse.json({ base: response.base, data: response.data, pagination: response.pagination })
-  } catch (error) {
-    if (isGrpcError(error)) return handleGrpcError(error)
-    return NextResponse.json({ base: { isSuccess: false, statusCode: "500", message: "Failed to list ERP shades", validationErrors: [] }, data: [] }, { status: 500 })
-  }
-}
diff --git a/src/app/api/v1/finance/cost-product-masters/[productSysId]/erp-linkage/route.ts b/src/app/api/v1/finance/cost-product-masters/[productSysId]/erp-linkage/route.ts
deleted file mode 100644
index 633f5c6..0000000
--- a/src/app/api/v1/finance/cost-product-masters/[productSysId]/erp-linkage/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// CostProductMaster — set/unset ERP linkage.
-import { NextRequest, NextResponse } from "next/server"
-import { getCostProductMasterClient, createMetadataFromRequest, isGrpcError, handleGrpcError } from "@/lib/grpc"
-
-export async function PUT(request: NextRequest, { params }: { params: Promise<{ productSysId: string }> }) {
-  try {
-    const { productSysId } = await params
-    const body = await request.json()
-    const metadata = createMetadataFromRequest(request)
-    const client = getCostProductMasterClient()
-    const response = await client.updateCostProductMasterErpLinkage(
-      {
-        productSysId: Number(productSysId),
-        erpItemCode: body.erpItemCode || body.erp_item_code || "",
-        erpGradeCode1: body.erpGradeCode1 || body.erp_grade_code_1 || "",
-        erpGradeCode2: body.erpGradeCode2 || body.erp_grade_code_2 || "",
-      },
-      metadata,
-    )
-    return NextResponse.json({ base: response.base, data: response.data })
-  } catch (error) {
-    if (isGrpcError(error)) return handleGrpcError(error)
-    return NextResponse.json({ base: { isSuccess: false, statusCode: "500", message: "Failed to update ERP linkage", validationErrors: [] } }, { status: 500 })
-  }
-}
diff --git a/src/app/api/v1/finance/costing/import/bulk_params_only/route.ts b/src/app/api/v1/finance/costing/import/bulk_params_only/route.ts
new file mode 100644
index 0000000..6cee208
--- /dev/null
+++ b/src/app/api/v1/finance/costing/import/bulk_params_only/route.ts
@@ -0,0 +1,73 @@
+// POST /api/v1/finance/costing/import/bulk_params_only
+// Accepts multipart/form-data ("file" field) to avoid JSON number-array inflation:
+// a 50 MB binary file as JSON becomes ~200 MB — this sends the actual binary bytes.
+// Falls back to JSON body (small files only) for backward compatibility.
+// Returns: { base, data: { jobId: number } }
+import { NextRequest, NextResponse } from "next/server"
+import {
+  getCostDataImportClient,
+  createMetadataFromRequest,
+  isGrpcError,
+  handleGrpcError,
+} from "@/lib/grpc"
+
+export async function POST(request: NextRequest) {
+  try {
+    const metadata = createMetadataFromRequest(request)
+    const client = getCostDataImportClient()
+
+    let fileContent: Uint8Array
+    let fileName: string
+
+    const contentType = request.headers.get("content-type") ?? ""
+
+    if (contentType.includes("multipart/form-data")) {
+      const formData = await request.formData()
+      const file = formData.get("file") as File | null
+      if (!file) {
+        return NextResponse.json(
+          {
+            base: {
+              isSuccess: false,
+              statusCode: "400",
+              message: "Missing 'file' field in form data",
+              validationErrors: [],
+            },
+          },
+          { status: 400 },
+        )
+      }
+      fileContent = new Uint8Array(await file.arrayBuffer())
+      fileName = file.name
+    } else {
+      // Legacy JSON fallback
+      const body = await request.json()
+      fileContent = new Uint8Array(body.fileContent as number[])
+      fileName = body.fileName ?? ""
+    }
+
+    const res = await client.importBulkParamsOnly(
+      { fileContent, fileName },
+      metadata,
+    )
+
+    return NextResponse.json({
+      base: res.base,
+      data: { jobId: res.jobId, status: res.status },
+    })
+  } catch (error) {
+    if (isGrpcError(error)) return handleGrpcError(error)
+    console.error("Error importing bulk params:", error)
+    return NextResponse.json(
+      {
+        base: {
+          isSuccess: false,
+          statusCode: "500",
+          message: "Failed to import params",
+          validationErrors: [],
+        },
+      },
+      { status: 500 },
+    )
+  }
+}
diff --git a/src/app/api/v1/finance/costing/template/bulk_params_only/route.ts b/src/app/api/v1/finance/costing/template/bulk_params_only/route.ts
new file mode 100644
index 0000000..1fa0b2c
--- /dev/null
+++ b/src/app/api/v1/finance/costing/template/bulk_params_only/route.ts
@@ -0,0 +1,57 @@
+// GET /api/v1/finance/costing/template/bulk_params_only
+// Returns a 2-sheet Excel template: product_parameters + product_applicable_params.
+// Use this when importing params separately from product master + routing.
+// Supports split part-sheets (e.g. product_parameters_p1, _p2) on import.
+import ExcelJS from "exceljs"
+import { NextResponse } from "next/server"
+
+const SHEETS: { name: string; headers: string[]; sample: string[] }[] = [
+  {
+    name: "product_parameters",
+    headers: [
+      "legacy_oracle_sys_id",
+      "param_code",
+      "data_type",
+      "value_numeric",
+      "value_text",
+      "value_flag",
+    ],
+    sample: ["2512", "PARAM_CODE", "NUMERIC", "100.5", "", ""],
+  },
+  {
+    name: "product_applicable_params",
+    headers: ["legacy_oracle_sys_id", "param_code", "is_required", "display_order"],
+    sample: ["2512", "PARAM_CODE", "true", "1"],
+  },
+]
+
+export async function GET() {
+  const wb = new ExcelJS.Workbook()
+
+  for (const sheet of SHEETS) {
+    const ws = wb.addWorksheet(sheet.name)
+    ws.addRow(sheet.headers)
+    ws.addRow(sheet.sample)
+
+    // Bold header row
+    const headerRow = ws.getRow(1)
+    headerRow.font = { bold: true }
+    headerRow.commit()
+
+    // Auto-width columns
+    sheet.headers.forEach((h, i) => {
+      const col = ws.getColumn(i + 1)
+      col.width = Math.max(h.length + 4, 14)
+    })
+  }
+
+  const buffer = await wb.xlsx.writeBuffer()
+
+  return new NextResponse(buffer, {
+    status: 200,
+    headers: {
+      "Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "Content-Disposition": 'attachment; filename="bulk_params_only_template.xlsx"',
+    },
+  })
+}
diff --git a/src/app/api/v1/finance/costing/template/bulk_product_routing/route.ts b/src/app/api/v1/finance/costing/template/bulk_product_routing/route.ts
index 8fb8d21..50ea80f 100644
--- a/src/app/api/v1/finance/costing/template/bulk_product_routing/route.ts
+++ b/src/app/api/v1/finance/costing/template/bulk_product_routing/route.ts
@@ -1,136 +1,155 @@
-import ExcelJS from "exceljs";
-import { NextResponse } from "next/server";
+import ExcelJS from "exceljs"
+import { NextResponse } from "next/server"
+
+// Column definitions match EXACTLY what the backend import handler reads.
+// See: services/finance/internal/application/costbulkimport/sheet_*.go
+//
+// Sheet name rules:
+//   - Prefixed names like "1_product_master" are accepted (fuzzy match)
+//   - Split part-sheets like "product_parameters_p1" + "_p2" are merged automatically
+//   - param sheets (product_parameters, product_applicable_params) are OPTIONAL
+//     — a file with only product_master + routing sheets imports cleanly
+//
+// Cross-sheet FK key: legacy_oracle_sys_id
+//   = cpm_flex_02 (Oracle integer sys_id) when set, else cpm_product_code
+//   Every sheet uses the same value to reference the same product.
+//
+// route_head_legacy_product_id (routing sheets)
+//   = the legacy_oracle_sys_id of the FG product that OWNS this route
+//
+// node_product_legacy_id (route_sequences)
+//   = legacy_oracle_sys_id of the intermediate/FG product at that DAG node
+//
+// rm_product_legacy_id (route_rms, rm_type=PRODUCT only)
+//   = legacy_oracle_sys_id of an upstream product used as RM input
+//   DIFFERENT from route_head_legacy_product_id — this is the RM product, not the head
 
 const SHEETS: { name: string; headers: string[]; sample: string[] }[] = [
   {
     name: "product_master",
     headers: [
-      "legacy_oracle_sys_id",
-      "product_type_code",
+      "legacy_oracle_sys_id",      // Oracle integer sys_id (or product_code as fallback)
+      "product_type_code",          // must exist in Finance > Master > Product Type
       "product_name",
       "shade_code",
       "shade_name",
       "grade_code",
       "description",
-      "erp_item_code",
-      "flex_01",
-      "flex_03",
-      "is_active",
+      "erp_item_code",              // optional ERP item code reference
+      "legacy_erp_compound_key",    // stored as flex_01 — optional legacy identifier
+      "legacy_type_label",          // stored as flex_03 — optional legacy type label
+      "is_active",                  // true / false
     ],
     sample: [
-      "PROD-001",
+      "2512",
       "FINISH",
       "Sample Product Name",
-      "SH-001",
-      "Shade Red",
-      "A",
-      "Sample description",
-      "ERP-001",
+      "NL",
+      "NATURAL",
+      "AX",
+      "",
+      "",
       "",
       "",
       "true",
     ],
   },
   {
-    name: "cpp",
+    name: "product_parameters",
     headers: [
       "legacy_oracle_sys_id",
-      "param_code",
-      "value_numeric",
-      "value_text",
-      "value_flag",
+      "param_code",                 // must exist in Finance > Master > Parameter
+      "data_type",                  // NUMERIC | TEXT | FLAG
+      "value_numeric",              // fill when data_type = NUMERIC
+      "value_text",                 // fill when data_type = TEXT
+      "value_flag",                 // fill when data_type = FLAG (true/false)
     ],
-    sample: ["PROD-001", "PARAM_CODE", "100.5", "", ""],
+    sample: ["2512", "PARAM_CODE", "NUMERIC", "100.5", "", ""],
   },
   {
-    name: "capp",
+    name: "product_applicable_params",
     headers: [
       "legacy_oracle_sys_id",
-      "param_code",
-      "is_required",
-      "display_order",
+      "param_code",                 // must exist in Finance > Master > Parameter
+      "is_required",                // true / false
+      "display_order",              // integer, 0 = inherit default
     ],
-    sample: ["PROD-001", "PARAM_CODE", "true", "1"],
+    sample: ["2512", "PARAM_CODE", "true", "1"],
   },
   {
     name: "route_head",
-    headers: ["legacy_oracle_sys_id", "notes"],
-    sample: ["PROD-001", "Main routing"],
+    headers: [
+      "legacy_oracle_sys_id",       // product that owns this route
+      "routing_status",             // DRAFT (always DRAFT for new imports)
+      "notes",
+    ],
+    sample: ["2512", "DRAFT", "Imported from Oracle"],
   },
   {
-    name: "route_seq",
+    name: "route_sequences",
     headers: [
-      "legacy_oracle_sys_id",
-      "route_level",
-      "route_seq",
-      "route_name",
-      "route_item_code",
-      "position_x",
-      "position_y",
-      "cyl_type_id",
+      "route_head_legacy_product_id",  // = legacy_oracle_sys_id of the FG product (head)
+      "node_product_legacy_id",        // = legacy_oracle_sys_id of the product at this node
+      "route_level",                   // positive integer, 1 = FG level
+      "route_seq",                     // sequence within a level, 1-based
+      "route_name",                    // optional: e.g. "POY 380/144/TBL/DBR/SIM/NS/1/O"
+      "route_item_code",               // optional: Oracle item code for this stage
+      "route_shade_code",              // optional: shade code for this stage
+      "route_shade_name",              // optional: shade name for this stage
     ],
-    sample: ["PROD-001", "1", "1", "Process 1", "SEQ-001", "0", "0", ""],
+    sample: ["2512", "2512", "1", "1", "", "", "", ""],
   },
   {
-    name: "route_rm",
+    name: "route_rms",
     headers: [
-      "legacy_oracle_sys_id",
-      "route_level",
-      "route_seq",
-      "rm_type",
-      "rm_product_legacy_id",
-      "rm_item_code",
-      "rm_group_code",
-      "rm_name",
-      "rm_item_code_ref",
-      "ratio",
-      "sub_type",
-      "notes",
-    ],
-    sample: [
-      "PROD-001",
-      "1",
-      "1",
-      "PRODUCT",
-      "RM-001",
-      "",
-      "",
-      "RM Name",
-      "",
-      "1.0",
-      "",
-      "",
+      "route_head_legacy_product_id",  // = legacy_oracle_sys_id of the FG product (head)
+      "route_level",                   // must match a row in route_sequences
+      "route_seq",                     // must match a row in route_sequences
+      "rm_type",                       // PRODUCT | GROUP
+      "ratio",                         // numeric, e.g. 1.0
+      "rm_product_legacy_id",          // for rm_type=PRODUCT: legacy_oracle_sys_id of upstream product
+      "rm_item_code",                  // for rm_type=ITEM (legacy, leave empty)
+      "rm_group_code",                 // for rm_type=GROUP: RM group code from Finance > Master > RM Groups
+      "rm_name",                       // optional display name
+      "rm_shade_code",                 // optional
+      "rm_shade_name",                 // optional
+      "sub_type",                      // optional: e.g. WARP / WEFT
+      "notes",                         // optional
     ],
+    sample: ["2512", "1", "1", "GROUP", "1.0", "", "", "MY_GROUP_CODE", "", "", "", "", ""],
   },
-];
+]
 
 export async function GET() {
-  const wb = new ExcelJS.Workbook();
+  const wb = new ExcelJS.Workbook()
 
   for (const sheet of SHEETS) {
-    const ws = wb.addWorksheet(sheet.name);
+    const ws = wb.addWorksheet(sheet.name)
 
-    // Set columns first — this writes the header row (row 1) automatically
-    ws.columns = sheet.headers.map((h, i) => ({
+    ws.columns = sheet.headers.map((h) => ({
       header: h,
-      key: String(i),
+      key: h,
       width: Math.max(h.length + 4, 16),
-    }));
+    }))
 
-    // Add only the sample data row (row 2)
-    ws.addRow(sheet.sample);
+    ws.addRow(sheet.sample)
 
-    // Bold header row
-    ws.getRow(1).font = { bold: true };
+    // Bold + light grey header row
+    const headerRow = ws.getRow(1)
+    headerRow.font = { bold: true }
+    headerRow.fill = {
+      type: "pattern",
+      pattern: "solid",
+      fgColor: { argb: "FFE8E8E8" },
+    }
+    headerRow.commit()
   }
 
-  const buffer = await wb.xlsx.writeBuffer();
+  const buffer = await wb.xlsx.writeBuffer()
   return new NextResponse(buffer, {
     headers: {
-      "Content-Type":
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-      "Content-Disposition":
-        'attachment; filename="bulk_product_routing_template.xlsx"',
+      "Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "Content-Disposition": 'attachment; filename="bulk_product_routing_template.xlsx"',
     },
-  });
+  })
 }
diff --git a/src/components/finance/box-bobbin-cost/box-bobbin-cost-form-dialog.tsx b/src/components/finance/box-bobbin-cost/box-bobbin-cost-form-dialog.tsx
index 4fb9be0..5a9ced3 100644
--- a/src/components/finance/box-bobbin-cost/box-bobbin-cost-form-dialog.tsx
+++ b/src/components/finance/box-bobbin-cost/box-bobbin-cost-form-dialog.tsx
@@ -50,6 +50,14 @@ const formSchema = z.object({
   noOfBob: z.coerce.number().int().min(1, "Must be at least 1"),
   notes: z.string().max(1000).optional(),
   isActive: z.boolean(),
+  bbnReuse:     z.coerce.number().min(0).optional().nullable(),
+  bbnReuseVal:  z.coerce.number().min(0).optional().nullable(),
+  boxReuse:     z.coerce.number().min(0).optional().nullable(),
+  boxReuseVal:  z.coerce.number().min(0).optional().nullable(),
+  boxCost:      z.coerce.number().min(0).optional().nullable(),
+  bobinCost:    z.coerce.number().min(0).optional().nullable(),
+  boxCostVal:   z.coerce.number().min(0).optional().nullable(),
+  bobinCostVal: z.coerce.number().min(0).optional().nullable(),
 })
 
 type FormValues = z.infer<typeof formSchema>
@@ -80,6 +88,14 @@ export function BoxBobbinCostFormDialog({
       noOfBob: 24,
       notes: "",
       isActive: true,
+      bbnReuse:     null,
+      bbnReuseVal:  null,
+      boxReuse:     null,
+      boxReuseVal:  null,
+      boxCost:      null,
+      bobinCost:    null,
+      boxCostVal:   null,
+      bobinCostVal: null,
     },
   })
 
@@ -88,14 +104,22 @@ export function BoxBobbinCostFormDialog({
       form.reset(
         boxBobbinCost
           ? {
-              bbcCode: boxBobbinCost.bbcCode || "",
-              bbcName: boxBobbinCost.bbcName || "",
-              bbcType: boxBobbinCost.bbcType || "",
-              noOfBob: boxBobbinCost.noOfBob ?? 24,
-              notes: boxBobbinCost.notes || "",
-              isActive: boxBobbinCost.isActive ?? true,
+              bbcCode:      boxBobbinCost.bbcCode || "",
+              bbcName:      boxBobbinCost.bbcName || "",
+              bbcType:      boxBobbinCost.bbcType || "",
+              noOfBob:      boxBobbinCost.noOfBob ?? 24,
+              notes:        boxBobbinCost.notes || "",
+              isActive:     boxBobbinCost.isActive ?? true,
+              bbnReuse:     boxBobbinCost.bbnReuse ?? null,
+              bbnReuseVal:  boxBobbinCost.bbnReuseVal ?? null,
+              boxReuse:     boxBobbinCost.boxReuse ?? null,
+              boxReuseVal:  boxBobbinCost.boxReuseVal ?? null,
+              boxCost:      boxBobbinCost.boxCost ?? null,
+              bobinCost:    boxBobbinCost.bobinCost ?? null,
+              boxCostVal:   boxBobbinCost.boxCostVal ?? null,
+              bobinCostVal: boxBobbinCost.bobinCostVal ?? null,
             }
-          : { bbcCode: "", bbcName: "", bbcType: "", noOfBob: 24, notes: "", isActive: true }
+          : { bbcCode: "", bbcName: "", bbcType: "", noOfBob: 24, notes: "", isActive: true, bbnReuse: null, bbnReuseVal: null, boxReuse: null, boxReuseVal: null, boxCost: null, bobinCost: null, boxCostVal: null, bobinCostVal: null }
       )
     }
   }, [open, boxBobbinCost, form])
@@ -106,21 +130,37 @@ export function BoxBobbinCostFormDialog({
         await updateMutation.mutateAsync({
           id: boxBobbinCost.bbcId,
           data: {
-            bbcId: boxBobbinCost.bbcId,
-            bbcName: values.bbcName,
-            bbcType: values.bbcType,
-            noOfBob: values.noOfBob,
-            notes: values.notes || "",
-            isActive: values.isActive,
+            bbcId:        boxBobbinCost.bbcId,
+            bbcName:      values.bbcName,
+            bbcType:      values.bbcType,
+            noOfBob:      values.noOfBob,
+            notes:        values.notes || "",
+            isActive:     values.isActive,
+            bbnReuse:     values.bbnReuse ?? undefined,
+            bbnReuseVal:  values.bbnReuseVal ?? undefined,
+            boxReuse:     values.boxReuse ?? undefined,
+            boxReuseVal:  values.boxReuseVal ?? undefined,
+            boxCost:      values.boxCost ?? undefined,
+            bobinCost:    values.bobinCost ?? undefined,
+            boxCostVal:   values.boxCostVal ?? undefined,
+            bobinCostVal: values.bobinCostVal ?? undefined,
           },
         })
       } else {
         await createMutation.mutateAsync({
-          bbcCode: values.bbcCode,
-          bbcName: values.bbcName,
-          bbcType: values.bbcType,
-          noOfBob: values.noOfBob,
-          notes: values.notes || "",
+          bbcCode:      values.bbcCode,
+          bbcName:      values.bbcName,
+          bbcType:      values.bbcType,
+          noOfBob:      values.noOfBob,
+          notes:        values.notes || "",
+          bbnReuse:     values.bbnReuse ?? undefined,
+          bbnReuseVal:  values.bbnReuseVal ?? undefined,
+          boxReuse:     values.boxReuse ?? undefined,
+          boxReuseVal:  values.boxReuseVal ?? undefined,
+          boxCost:      values.boxCost ?? undefined,
+          bobinCost:    values.bobinCost ?? undefined,
+          boxCostVal:   values.boxCostVal ?? undefined,
+          bobinCostVal: values.bobinCostVal ?? undefined,
         })
       }
       onOpenChange(false)
@@ -232,6 +272,180 @@ export function BoxBobbinCostFormDialog({
               />
             </div>
 
+            <div className="border-t pt-4 mt-2">
+              <p className="text-sm font-medium text-muted-foreground mb-3">Rates &amp; Reuse</p>
+              <div className="grid grid-cols-2 gap-4">
+                <FormField
+                  control={form.control}
+                  name="bbnReuse"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Bobbin Reuse Count <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="bbnReuseVal"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Bobbin Reuse Count VAL <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="boxReuse"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Box Reuse Count <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="boxReuseVal"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Box Reuse Count VAL <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="boxCost"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Box Rate MKT (USD) <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="bobinCost"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Bobbin Rate MKT (USD) <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="boxCostVal"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Box Rate VAL (USD) <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="bobinCostVal"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Bobbin Rate VAL (USD) <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.000001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+            </div>
+
             <FormField
               control={form.control}
               name="notes"
diff --git a/src/components/finance/box-bobbin-cost/box-bobbin-cost-table.tsx b/src/components/finance/box-bobbin-cost/box-bobbin-cost-table.tsx
index 97bd7e6..22705b9 100644
--- a/src/components/finance/box-bobbin-cost/box-bobbin-cost-table.tsx
+++ b/src/components/finance/box-bobbin-cost/box-bobbin-cost-table.tsx
@@ -42,6 +42,20 @@ export function BoxBobbinCostTable({ data, isLoading, onEdit, onDelete }: BoxBob
       hideOnMobile: true,
       cell: (row) => row.noOfBob ?? "-",
     },
+    {
+      id: "boxCost",
+      header: "Box Rate MKT",
+      width: "w-[120px]",
+      hideOnMobile: true,
+      cell: (row) => row.boxCost != null ? `$${row.boxCost.toFixed(4)}` : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "bobinCost",
+      header: "Bobbin Rate MKT",
+      width: "w-[130px]",
+      hideOnMobile: true,
+      cell: (row) => row.bobinCost != null ? `$${row.bobinCost.toFixed(4)}` : <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "notes",
       header: "Notes",
diff --git a/src/components/finance/comboboxes/erp-item-combobox.tsx b/src/components/finance/comboboxes/erp-item-combobox.tsx
deleted file mode 100644
index 66152db..0000000
--- a/src/components/finance/comboboxes/erp-item-combobox.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-"use client"
-
-// ErpItemCombobox — picks a CostErpItem by item_code/item_name. Used when rm_type.reference_target = MASTER.
-import { Check, ChevronsUpDown, Loader2 } from "lucide-react"
-import { useMemo, useState } from "react"
-
-import { Button } from "@/components/ui/button"
-import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command"
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
-import { useErpItems } from "@/hooks/finance/use-cost-erp"
-import { cn } from "@/lib/utils"
-
-interface ErpItemComboboxProps {
-  value: number | undefined
-  onChange: (itemId: number, itemCode: string, itemName: string) => void
-  itemType?: string
-  placeholder?: string
-  disabled?: boolean
-  className?: string
-}
-
-export function ErpItemCombobox({ value, onChange, itemType, placeholder = "Select ERP item…", disabled, className }: ErpItemComboboxProps) {
-  const [open, setOpen] = useState(false)
-  const [search, setSearch] = useState("")
-  const { data, isLoading } = useErpItems({ search, itemType, activeFilter: "active", pageSize: 50 })
-  const selected = useMemo(() => data?.items.find((it) => it.itemId === value), [data, value])
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
-        <Button
-          type="button"
-          variant="outline"
-          role="combobox"
-          aria-expanded={open}
-          disabled={disabled}
-          className={cn("w-full justify-between font-normal", className)}
-        >
-          {selected ? (
-            <span className="truncate">
-              <span className="text-muted-foreground">{selected.itemCode}</span> — {selected.itemName}
-            </span>
-          ) : (
-            <span className="text-muted-foreground">{placeholder}</span>
-          )}
-          <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0" align="start">
-        <Command shouldFilter={false}>
-          <CommandInput placeholder="Search by code or name…" value={search} onValueChange={setSearch} />
-          <CommandList>
-            {isLoading && (
-              <div className="py-6 text-center text-sm text-muted-foreground flex items-center justify-center gap-2">
-                <Loader2 className="h-4 w-4 animate-spin" /> Loading…
-              </div>
-            )}
-            <CommandEmpty>No ERP item matches.</CommandEmpty>
-            <CommandGroup>
-              {(data?.items ?? []).map((it) => (
-                <CommandItem
-                  key={it.itemId}
-                  value={`${it.itemCode} ${it.itemName}`}
-                  onSelect={() => {
-                    onChange(it.itemId, it.itemCode, it.itemName)
-                    setOpen(false)
-                  }}
-                >
-                  <Check className={cn("mr-2 h-4 w-4", value === it.itemId ? "opacity-100" : "opacity-0")} />
-                  <div className="flex flex-col">
-                    <div>
-                      <span className="font-mono text-xs mr-2 text-muted-foreground">{it.itemCode}</span>
-                      <span>{it.itemName}</span>
-                    </div>
-                    {it.itemType && <span className="text-xs text-muted-foreground">{it.itemType}</span>}
-                  </div>
-                </CommandItem>
-              ))}
-            </CommandGroup>
-          </CommandList>
-        </Command>
-      </PopoverContent>
-    </Popover>
-  )
-}
diff --git a/src/components/finance/comboboxes/index.ts b/src/components/finance/comboboxes/index.ts
index ed35773..6d9e1ed 100644
--- a/src/components/finance/comboboxes/index.ts
+++ b/src/components/finance/comboboxes/index.ts
@@ -1,6 +1,5 @@
 export { ProductTypeCombobox } from "./product-type-combobox"
 export { RmTypeCombobox } from "./rm-type-combobox"
-export { ErpItemCombobox } from "./erp-item-combobox"
 export { ProductMasterCombobox } from "./product-master-combobox"
 export { RequestTypeCombobox } from "./request-type-combobox"
 export { PaperTubeTypeCombobox } from "./paper-tube-type-combobox"
diff --git a/src/components/finance/cost-product-master/add-parameter-dialog.tsx b/src/components/finance/cost-product-master/add-parameter-dialog.tsx
index ab57c10..86aba4f 100644
--- a/src/components/finance/cost-product-master/add-parameter-dialog.tsx
+++ b/src/components/finance/cost-product-master/add-parameter-dialog.tsx
@@ -32,6 +32,7 @@ export function AddParameterDialog({ productSysId, open, onOpenChange }: Props)
   const qc = useQueryClient()
   const [search, setSearch] = useState("")
   const [overrides, setOverrides] = useState<Record<string, boolean>>({}) // paramId → isRequired
+  const [displayOrders, setDisplayOrders] = useState<Record<string, string>>({}) // paramId → display_order
   const [addingId, setAddingId] = useState<string | null>(null)
 
   // Filter out child params — they are auto-managed via MASTER_LOOKUP trigger.
@@ -55,6 +56,7 @@ export function AddParameterDialog({ productSysId, open, onOpenChange }: Props)
     setAddingId(entry.paramId)
     try {
       const isReq = overrides[entry.paramId] ?? entry.isRequiredForCosting
+      const displayOrder = Number(displayOrders[entry.paramId] ?? 0)
       const isMasterLookup = entry.paramCategory === "MASTER_LOOKUP"
       const endpoint = isMasterLookup
         ? "/api/v1/finance/cost-product-parameters/applicable/add-with-children"
@@ -62,7 +64,7 @@ export function AddParameterDialog({ productSysId, open, onOpenChange }: Props)
       const res = await fetch(endpoint, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ productSysId, paramId: entry.paramId, isRequired: isReq }),
+        body: JSON.stringify({ productSysId, paramId: entry.paramId, isRequired: isReq, displayOrder }),
       })
       const body = await res.json()
       if (!res.ok || body?.base?.isSuccess === false) {
@@ -113,7 +115,7 @@ export function AddParameterDialog({ productSysId, open, onOpenChange }: Props)
                 key={entry.paramId}
                 className="rounded border p-3 grid grid-cols-12 gap-3 items-center"
               >
-                <div className="col-span-7">
+                <div className="col-span-6">
                   <div className="text-sm font-medium flex items-center gap-2">
                     {entry.paramName}
                     <Badge variant="outline" className="text-[10px] font-mono">
@@ -131,14 +133,27 @@ export function AddParameterDialog({ productSysId, open, onOpenChange }: Props)
                     {entry.ownerDepartment && <> · Owner: {entry.ownerDepartment}</>}
                   </div>
                 </div>
-                <div className="col-span-3 flex items-center gap-2">
+                <div className="col-span-2 flex items-center gap-2">
                   <Switch
                     checked={overrides[entry.paramId] ?? entry.isRequiredForCosting}
                     onCheckedChange={(v) =>
                       setOverrides((prev) => ({ ...prev, [entry.paramId]: v }))
                     }
                   />
-                  <Label className="text-xs">Required</Label>
+                  <Label className="text-xs">Req</Label>
+                </div>
+                <div className="col-span-2">
+                  <input
+                    type="number"
+                    min={0}
+                    placeholder="Order"
+                    title="Display order (0 = inherit default)"
+                    className="h-8 w-full rounded border border-input bg-background px-2 text-xs"
+                    value={displayOrders[entry.paramId] ?? ""}
+                    onChange={(e) =>
+                      setDisplayOrders((prev) => ({ ...prev, [entry.paramId]: e.target.value }))
+                    }
+                  />
                 </div>
                 <div className="col-span-2 text-right">
                   <Button
diff --git a/src/components/finance/cost-product-master/erp-linkage-dialog.tsx b/src/components/finance/cost-product-master/erp-linkage-dialog.tsx
deleted file mode 100644
index 36426c0..0000000
--- a/src/components/finance/cost-product-master/erp-linkage-dialog.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-"use client"
-
-// ErpLinkageDialog — links a product master to ERP master_item + grade codes.
-// Uses ErpItemCombobox so the user never sees raw IDs; we store item_code (string) on submit.
-import { useState } from "react"
-import { Loader2 } from "lucide-react"
-
-import { Button } from "@/components/ui/button"
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { ErpItemCombobox } from "@/components/finance/comboboxes"
-import { useUpdateErpLinkage } from "@/hooks/finance/use-cost-product-master"
-import type { CostProductMaster } from "@/types/finance/cost-product-master"
-
-interface Props {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  product: CostProductMaster | null
-}
-
-export function ErpLinkageDialog({ open, onOpenChange, product }: Props) {
-  // Body is keyed by product.productSysId, so changing the active product remounts
-  // the inner state-holding component — avoiding setState-in-effect on prop change.
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-lg">
-        {product && (
-          <ErpLinkageDialogBody
-            key={product.productSysId}
-            product={product}
-            onClose={() => onOpenChange(false)}
-          />
-        )}
-      </DialogContent>
-    </Dialog>
-  )
-}
-
-function ErpLinkageDialogBody({
-  product,
-  onClose,
-}: {
-  product: CostProductMaster
-  onClose: () => void
-}) {
-  const mutation = useUpdateErpLinkage()
-  const [erpItemCode, setErpItemCode] = useState(product.erpItemCode || "")
-  const [erpGrade1, setErpGrade1] = useState(product.erpGradeCode1 || "")
-  const [erpGrade2, setErpGrade2] = useState(product.erpGradeCode2 || "")
-
-  async function onSubmit() {
-    try {
-      await mutation.mutateAsync({
-        productSysId: product.productSysId,
-        erpItemCode,
-        erpGradeCode1: erpGrade1,
-        erpGradeCode2: erpGrade2,
-      })
-      onClose()
-    } catch {
-      /* toast in hook */
-    }
-  }
-
-  return (
-    <>
-      <DialogHeader>
-        <DialogTitle>ERP linkage for {product.productCode}</DialogTitle>
-        <DialogDescription>
-          Link this product to an ERP master_item and up to two ERP grade codes. Clear the item
-          field to unlink.
-        </DialogDescription>
-      </DialogHeader>
-      <div className="space-y-4">
-        <div className="space-y-1.5">
-          <Label>ERP item</Label>
-          <ErpItemCombobox
-            value={undefined}
-            onChange={(_id, code) => setErpItemCode(code)}
-            placeholder={erpItemCode ? `Currently: ${erpItemCode}` : "Pick an ERP item…"}
-          />
-          {erpItemCode && (
-            <div className="text-xs text-muted-foreground">
-              Selected: <span className="font-mono">{erpItemCode}</span>{" "}
-              <Button
-                type="button"
-                variant="link"
-                size="sm"
-                className="h-auto p-0"
-                onClick={() => setErpItemCode("")}
-              >
-                Clear
-              </Button>
-            </div>
-          )}
-        </div>
-        <div className="grid grid-cols-2 gap-4">
-          <div className="space-y-1.5">
-            <Label>ERP grade 1</Label>
-            <Input value={erpGrade1} onChange={(e) => setErpGrade1(e.target.value)} placeholder="AX" />
-          </div>
-          <div className="space-y-1.5">
-            <Label>ERP grade 2</Label>
-            <Input
-              value={erpGrade2}
-              onChange={(e) => setErpGrade2(e.target.value)}
-              placeholder="(optional)"
-            />
-          </div>
-        </div>
-      </div>
-      <DialogFooter>
-        <Button variant="outline" onClick={onClose}>
-          Cancel
-        </Button>
-        <Button onClick={onSubmit} disabled={mutation.isPending}>
-          {mutation.isPending && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-          Save linkage
-        </Button>
-      </DialogFooter>
-    </>
-  )
-}
diff --git a/src/components/finance/cost-product-master/index.ts b/src/components/finance/cost-product-master/index.ts
index e846b4d..9b99351 100644
--- a/src/components/finance/cost-product-master/index.ts
+++ b/src/components/finance/cost-product-master/index.ts
@@ -1,4 +1,3 @@
 export { ProductMasterFormDialog } from "./product-master-form-dialog"
 export { ProductMasterTable } from "./product-master-table"
-export { ErpLinkageDialog } from "./erp-linkage-dialog"
 export { DeactivateProductMasterDialog } from "./deactivate-dialog"
diff --git a/src/components/finance/cost-product-master/product-master-form-dialog.tsx b/src/components/finance/cost-product-master/product-master-form-dialog.tsx
index 802a535..ab45507 100644
--- a/src/components/finance/cost-product-master/product-master-form-dialog.tsx
+++ b/src/components/finance/cost-product-master/product-master-form-dialog.tsx
@@ -25,6 +25,9 @@ const schema = z.object({
   shadeCode: z.string().max(50, "Max 50 chars"),
   gradeCode: z.string().max(20, "Max 20 chars"),
   description: z.string().max(2000, "Max 2000 chars"),
+  flex01: z.string().max(255, "Max 255 chars"),
+  flex02: z.string().max(100, "Max 100 chars"),
+  flex03: z.string().max(100, "Max 100 chars"),
 })
 
 type FormValues = z.infer<typeof schema>
@@ -44,6 +47,7 @@ export function ProductMasterFormDialog({ open, onOpenChange, product }: Props)
     resolver: zodResolver(schema) as never,
     defaultValues: {
       productTypeId: 0, productName: "", shadeCode: "", gradeCode: "AX", description: "",
+      flex01: "", flex02: "", flex03: "",
     },
   })
 
@@ -55,6 +59,9 @@ export function ProductMasterFormDialog({ open, onOpenChange, product }: Props)
         shadeCode: product?.shadeCode ?? "",
         gradeCode: product?.gradeCode || "AX",
         description: product?.description ?? "",
+        flex01: product?.flex01 ?? "",
+        flex02: product?.flex02 ?? "",
+        flex03: product?.flex03 ?? "",
       })
     }
   }, [open, product, form])
@@ -68,6 +75,9 @@ export function ProductMasterFormDialog({ open, onOpenChange, product }: Props)
           shadeCode: values.shadeCode,
           gradeCode: values.gradeCode,
           description: values.description,
+          flex01: values.flex01,
+          flex02: values.flex02,
+          flex03: values.flex03,
         })
       } else {
         await createMutation.mutateAsync({
@@ -76,6 +86,9 @@ export function ProductMasterFormDialog({ open, onOpenChange, product }: Props)
           shadeCode: values.shadeCode,
           gradeCode: values.gradeCode,
           description: values.description,
+          flex01: values.flex01,
+          flex02: values.flex02,
+          flex03: values.flex03,
         })
       }
       onOpenChange(false)
@@ -174,6 +187,55 @@ export function ProductMasterFormDialog({ open, onOpenChange, product }: Props)
                 </FormItem>
               )}
             />
+            <details className="rounded border p-3 text-sm">
+              <summary className="cursor-pointer select-none font-medium text-muted-foreground">
+                Legacy / Import identifiers (optional)
+              </summary>
+              <div className="mt-3 space-y-3">
+                <FormField
+                  control={form.control}
+                  name="flex02"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Oracle Sys ID</FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="e.g. 2512" />
+                      </FormControl>
+                      <FormDescription>Legacy Oracle integer sys_id (legacy_oracle_sys_id).</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="flex01"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>ERP Compound Key</FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="e.g. INV.FG.001" />
+                      </FormControl>
+                      <FormDescription>Legacy ERP compound key (legacy_erp_compound_key).</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="flex03"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Type Label</FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="e.g. FINISH" />
+                      </FormControl>
+                      <FormDescription>Legacy product type label (legacy_type_label).</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+            </details>
             <DialogFooter>
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
                 Cancel
diff --git a/src/components/finance/cost-product-master/product-master-table.tsx b/src/components/finance/cost-product-master/product-master-table.tsx
index 41d5972..cdcf834 100644
--- a/src/components/finance/cost-product-master/product-master-table.tsx
+++ b/src/components/finance/cost-product-master/product-master-table.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import Link from "next/link"
-import { Edit, Link2, Power } from "lucide-react"
+import { Edit, Power } from "lucide-react"
 
 import { Badge } from "@/components/ui/badge"
 import { ProductTypeName } from "@/components/common/product-type-name"
@@ -15,11 +15,10 @@ interface Props {
   items: CostProductMaster[]
   isLoading?: boolean
   onEdit: (p: CostProductMaster) => void
-  onLinkErp: (p: CostProductMaster) => void
   onDeactivate: (p: CostProductMaster) => void
 }
 
-export function ProductMasterTable({ items, isLoading, onEdit, onLinkErp, onDeactivate }: Props) {
+export function ProductMasterTable({ items, isLoading, onEdit, onDeactivate }: Props) {
   return (
     <div className="rounded-md border">
       <Table>
@@ -30,22 +29,24 @@ export function ProductMasterTable({ items, isLoading, onEdit, onLinkErp, onDeac
             <TableHead className="w-32">Type</TableHead>
             <TableHead className="w-24">Shade</TableHead>
             <TableHead className="w-20">Grade</TableHead>
-            <TableHead className="w-40">ERP linkage</TableHead>
+            <TableHead className="w-28">Oracle Sys ID</TableHead>
+            <TableHead className="w-36">ERP Compound Key</TableHead>
+            <TableHead className="w-24">Type Label</TableHead>
             <TableHead className="w-24">Status</TableHead>
-            <TableHead className="w-44 text-right">Actions</TableHead>
+            <TableHead className="w-24 text-right">Actions</TableHead>
           </TableRow>
         </TableHeader>
         <TableBody>
           {isLoading && (
             <TableRow>
-              <TableCell colSpan={8} className="text-center py-8 text-muted-foreground">
+              <TableCell colSpan={10} className="text-center py-8 text-muted-foreground">
                 Loading…
               </TableCell>
             </TableRow>
           )}
           {!isLoading && items.length === 0 && (
             <TableRow>
-              <TableCell colSpan={8} className="text-center py-8 text-muted-foreground">
+              <TableCell colSpan={10} className="text-center py-8 text-muted-foreground">
                 No products yet.
               </TableCell>
             </TableRow>
@@ -70,20 +71,9 @@ export function ProductMasterTable({ items, isLoading, onEdit, onLinkErp, onDeac
               </TableCell>
               <TableCell>{p.shadeCode || "—"}</TableCell>
               <TableCell>{p.gradeCode}</TableCell>
-              <TableCell className="text-xs">
-                {p.erpItemCode ? (
-                  <div className="space-y-0.5">
-                    <div className="font-mono">{p.erpItemCode}</div>
-                    {(p.erpGradeCode1 || p.erpGradeCode2) && (
-                      <div className="text-muted-foreground">
-                        {[p.erpGradeCode1, p.erpGradeCode2].filter(Boolean).join(" / ")}
-                      </div>
-                    )}
-                  </div>
-                ) : (
-                  <span className="text-muted-foreground">Not linked</span>
-                )}
-              </TableCell>
+              <TableCell className="font-mono text-xs">{p.flex02 || "—"}</TableCell>
+              <TableCell className="font-mono text-xs">{p.flex01 || "—"}</TableCell>
+              <TableCell className="text-xs">{p.flex03 || "—"}</TableCell>
               <TableCell>
                 {p.isActive ? (
                   <Badge variant="secondary">Active</Badge>
@@ -95,9 +85,6 @@ export function ProductMasterTable({ items, isLoading, onEdit, onLinkErp, onDeac
                 <Button size="icon" variant="ghost" onClick={() => onEdit(p)} disabled={!p.isActive} title="Edit">
                   <Edit className="h-4 w-4" />
                 </Button>
-                <Button size="icon" variant="ghost" onClick={() => onLinkErp(p)} disabled={!p.isActive} title="ERP linkage">
-                  <Link2 className="h-4 w-4" />
-                </Button>
                 <Button
                   size="icon"
                   variant="ghost"
diff --git a/src/components/finance/cost-results/cost-breakdown-modal.tsx b/src/components/finance/cost-results/cost-breakdown-modal.tsx
index 4e85163..788dc3d 100644
--- a/src/components/finance/cost-results/cost-breakdown-modal.tsx
+++ b/src/components/finance/cost-results/cost-breakdown-modal.tsx
@@ -1,13 +1,18 @@
 "use client"
 
+import { ArrowRight, X } from "lucide-react"
+
 import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog"
+  Sheet,
+  SheetClose,
+  SheetContent,
+  SheetDescription,
+  SheetTitle,
+} from "@/components/ui/sheet"
+import { Skeleton } from "@/components/ui/skeleton"
 import {
   Table,
   TableBody,
@@ -17,7 +22,10 @@ import {
   TableRow,
 } from "@/components/ui/table"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { UserName } from "@/components/common/user-name"
 import { useCostBreakdown } from "@/hooks/finance/use-cost-calc"
+import { useCostProductMaster } from "@/hooks/finance/use-cost-product-master"
+import { useProductRequiredParams } from "@/hooks/finance/use-cost-product-parameter"
 import type {
   CalculationType,
   CostBreakdown,
@@ -48,114 +56,192 @@ export function CostBreakdownModal({
     open ? period : undefined,
     open ? calcType : undefined,
   )
+  const s = breakdown?.summary
+
+  // Same fallback as detail page — breakdown summary may also have empty code/name.
+  const needsFallback = s != null && (!s.productCode || !s.productName)
+  const { data: productMaster } = useCostProductMaster(needsFallback ? productSysId : undefined)
+  const productCode = s?.productCode || productMaster?.productCode || `#${productSysId}`
+  const productName = s?.productName || productMaster?.productName || ""
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-5xl max-h-[90vh] overflow-hidden flex flex-col">
-        <DialogHeader>
-          <DialogTitle>
-            Cost breakdown
-            {breakdown?.summary
-              ? ` — ${breakdown.summary.productCode} (${breakdown.summary.period} / ${breakdown.summary.calculationType})`
-              : ""}
-          </DialogTitle>
-        </DialogHeader>
-        {isLoading || !breakdown ? (
-          <div className="text-sm text-muted-foreground py-8 text-center">
-            Loading…
+    <Sheet open={open} onOpenChange={onOpenChange}>
+      <SheetContent
+        side="right"
+        showCloseButton={false}
+        className="flex w-full flex-col gap-0 p-0 sm:max-w-3xl"
+      >
+        {/* ── Sticky header ── same structure as FillParamDrawer */}
+        <div className="flex shrink-0 items-start gap-3 border-b bg-background px-6 py-4">
+          <div className="min-w-0 flex-1 space-y-1">
+            <SheetTitle className="text-base font-semibold leading-tight">
+              {productName || productCode}
+            </SheetTitle>
+            <SheetDescription className="text-xs text-muted-foreground">
+              {productName ? `${productCode}  ·  ` : ""}Period {period} · {calcType}
+              {s?.version !== undefined ? ` · v${s.version}` : ""}
+            </SheetDescription>
           </div>
-        ) : (
-          <Tabs defaultValue="summary" className="flex-1 overflow-hidden flex flex-col">
-            <TabsList>
-              <TabsTrigger value="summary">Summary</TabsTrigger>
-              <TabsTrigger value="by-level">
-                By level ({breakdown.byLevel.length})
-              </TabsTrigger>
-              <TabsTrigger value="rm-breakdown">
-                RM breakdown ({breakdown.rmDetails.length})
-              </TabsTrigger>
-              <TabsTrigger value="formula-trace">
-                Formula trace ({breakdown.formulaTrace.length})
-              </TabsTrigger>
-            </TabsList>
-            <div className="flex-1 overflow-auto mt-4">
-              <TabsContent value="summary">
-                <SummaryTab breakdown={breakdown} />
+          <div className="flex shrink-0 items-center gap-1">
+            <SheetClose asChild>
+              <Button variant="ghost" size="icon" className="h-8 w-8">
+                <X className="h-4 w-4" />
+                <span className="sr-only">Close</span>
+              </Button>
+            </SheetClose>
+          </div>
+        </div>
+
+        {/* ── Loading ── */}
+        {isLoading && (
+          <div className="flex-1 space-y-4 overflow-y-auto px-6 py-5">
+            <Skeleton className="h-10 w-64" />
+            <Skeleton className="h-32 w-full rounded-lg" />
+            <Skeleton className="h-48 w-full rounded-lg" />
+          </div>
+        )}
+
+        {/* ── Tabs + scrollable content ── */}
+        {!isLoading && breakdown && (
+          <Tabs
+            defaultValue="summary"
+            className="flex flex-1 flex-col overflow-hidden"
+          >
+            {/* Tab list — sticky below header, standard shadcn TabsList */}
+            <div className="shrink-0 border-b bg-background px-4 py-3">
+              <TabsList className="grid w-full grid-cols-4">
+                <TabsTrigger value="summary">Summary</TabsTrigger>
+                <TabsTrigger value="by-level">
+                  By level
+                  <span className="ml-1 text-xs opacity-60">{breakdown.byLevel.length}</span>
+                </TabsTrigger>
+                <TabsTrigger value="rm">
+                  RM
+                  <span className="ml-1 text-xs opacity-60">{breakdown.rmDetails.length}</span>
+                </TabsTrigger>
+                <TabsTrigger value="formula">
+                  Formula
+                  <span className="ml-1 text-xs opacity-60">{breakdown.formulaTrace.length}</span>
+                </TabsTrigger>
+              </TabsList>
+            </div>
+
+            {/* Scrollable panels — only the active TabsContent is visible */}
+            <div className="flex-1 overflow-y-auto">
+              <TabsContent value="summary" className="m-0 px-6 py-5">
+                <SummaryTab breakdown={breakdown} productSysId={productSysId} />
               </TabsContent>
-              <TabsContent value="by-level">
+              <TabsContent value="by-level" className="m-0 px-6 py-5">
                 <ByLevelTab rows={breakdown.byLevel} />
               </TabsContent>
-              <TabsContent value="rm-breakdown">
+              <TabsContent value="rm" className="m-0 px-6 py-5">
                 <RmTab rows={breakdown.rmDetails} />
               </TabsContent>
-              <TabsContent value="formula-trace">
-                <FormulaTraceTab
-                  rows={breakdown.formulaTrace}
-                  paramSnapshot={breakdown.paramSnapshot}
-                />
+              <TabsContent value="formula" className="m-0 px-6 py-5">
+                <FormulaTraceTab rows={breakdown.formulaTrace} />
               </TabsContent>
             </div>
           </Tabs>
         )}
-      </DialogContent>
-    </Dialog>
+      </SheetContent>
+    </Sheet>
   )
 }
 
-// ---------- Summary tab ----------
+// ── Summary tab ───────────────────────────────────────────────────────────────
 
-function SummaryTab({ breakdown }: { breakdown: CostBreakdown }) {
+function SummaryTab({ breakdown, productSysId }: { breakdown: CostBreakdown; productSysId: number }) {
   const s = breakdown.summary
   const snapshotEntries = Object.entries(breakdown.paramSnapshot)
+
+  // Fetch parameter definitions for this product to get the proper displayGroup labels.
+  const { data: requiredParams = [] } = useProductRequiredParams(productSysId)
+  const groupMap = new Map(requiredParams.map((p) => [p.paramCode, p.displayGroup || "Other"]))
+
+  // Group snapshot entries by displayGroup from the parameter master.
+  // Fall back to "Other" for params not found in the map.
+  const grouped: Record<string, [string, string][]> = {}
+  for (const [k, v] of snapshotEntries) {
+    const group = groupMap.get(k) || "General"
+    if (!grouped[group]) grouped[group] = []
+    grouped[group].push([k, v])
+  }
+  const groupEntries = Object.entries(grouped).sort(([a], [b]) =>
+    a === "General" ? 1 : b === "General" ? -1 : a.localeCompare(b),
+  )
+
   return (
-    <div className="space-y-4">
-      {s ? (
-        <Card>
-          <CardHeader>
-            <CardTitle className="text-base">
-              {s.productCode} — {s.productName}
-            </CardTitle>
-          </CardHeader>
-          <CardContent className="grid grid-cols-2 gap-4 md:grid-cols-4">
-            <Stat
-              label="Cost per unit"
-              value={`${s.currencyCode || ""} ${formatNumeric(s.costPerUnit)}`.trim()}
-              highlight
-            />
-            <Stat label="Total RM cost" value={formatNumeric(s.totalRmCost)} />
-            <Stat label="Conversion" value={formatNumeric(s.totalConversion)} />
-            <Stat label="Total cost" value={formatNumeric(s.totalCost)} />
-            <Stat label="Version" value={`v${s.version}`} />
-            <Stat label="Status" value={<Badge>{s.status}</Badge>} />
-            <Stat label="Calculated" value={formatDate(s.calculatedAt)} />
-            <Stat label="By" value={s.calculatedBy || "—"} />
-          </CardContent>
-        </Card>
-      ) : null}
+    <div className="space-y-5">
+      {s && (
+        <div className="grid grid-cols-2 gap-x-6 gap-y-4 text-sm md:grid-cols-4">
+          <Field label="Cost per unit">
+            <span className="text-xl font-semibold tabular-nums">
+              {s.currencyCode ? `${s.currencyCode} ` : ""}
+              {formatNumeric(s.costPerUnit)}
+            </span>
+          </Field>
+          <Field label="Total RM cost">
+            <span className="font-mono tabular-nums">{formatNumeric(s.totalRmCost)}</span>
+          </Field>
+          <Field label="Conversion">
+            <span className="font-mono tabular-nums">{formatNumeric(s.totalConversion)}</span>
+          </Field>
+          <Field label="Total cost">
+            <span className="font-mono font-semibold tabular-nums">{formatNumeric(s.totalCost)}</span>
+          </Field>
+          <Field label="Calculated">
+            <span className="text-muted-foreground">{formatDate(s.calculatedAt)}</span>
+          </Field>
+          <Field label="By">
+            {s.calculatedBy
+              ? <UserName userId={s.calculatedBy} compact className="text-muted-foreground" />
+              : <span className="text-muted-foreground">—</span>}
+          </Field>
+          {s.verifiedAt && (
+            <Field label="Verified">
+              <span className="text-muted-foreground">{formatDate(s.verifiedAt)}</span>
+            </Field>
+          )}
+          {s.verifiedBy && (
+            <Field label="Verified by">
+              <UserName userId={s.verifiedBy} compact className="text-muted-foreground" />
+            </Field>
+          )}
+        </div>
+      )}
 
       <Card>
         <CardHeader>
-          <CardTitle className="text-sm">
-            Parameter snapshot ({snapshotEntries.length})
+          <CardTitle className="text-sm font-semibold">
+            Parameter snapshot
+            <span className="ml-2 text-xs font-normal text-muted-foreground">
+              {snapshotEntries.length} params · {groupEntries.length} groups
+            </span>
           </CardTitle>
         </CardHeader>
-        <CardContent>
+        <CardContent className="space-y-4">
           {snapshotEntries.length === 0 ? (
-            <div className="text-sm text-muted-foreground">No parameters captured.</div>
+            <p className="text-sm text-muted-foreground">No parameters captured.</p>
           ) : (
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-1 max-h-96 overflow-auto">
-              {snapshotEntries.map(([k, v]) => (
-                <div
-                  key={k}
-                  className="flex items-baseline justify-between gap-4 border-b py-1 text-sm"
-                >
-                  <span className="font-mono text-xs text-muted-foreground truncate">
-                    {k}
-                  </span>
-                  <span className="font-mono text-xs tabular-nums">{v}</span>
+            groupEntries.map(([groupName, entries]) => (
+              <div key={groupName}>
+                <p className="mb-1.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">
+                  {groupName}
+                  <span className="ml-1.5 font-normal normal-case">({entries.length})</span>
+                </p>
+                <div className="grid grid-cols-1 gap-x-8 sm:grid-cols-2">
+                  {entries.map(([k, v]) => (
+                    <div
+                      key={k}
+                      className="flex items-baseline justify-between gap-3 border-b py-1.5 last:border-0"
+                    >
+                      <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">{k}</span>
+                      <span className="shrink-0 font-mono text-xs tabular-nums">{v}</span>
+                    </div>
+                  ))}
                 </div>
-              ))}
-            </div>
+              </div>
+            ))
           )}
         </CardContent>
       </Card>
@@ -163,174 +249,173 @@ function SummaryTab({ breakdown }: { breakdown: CostBreakdown }) {
   )
 }
 
-function Stat({
-  label,
-  value,
-  highlight,
-}: {
-  label: string
-  value: React.ReactNode
-  highlight?: boolean
-}) {
-  return (
-    <div>
-      <div className="text-xs text-muted-foreground">{label}</div>
-      <div className={highlight ? "text-2xl font-semibold tabular-nums" : "text-sm"}>
-        {value}
-      </div>
-    </div>
-  )
-}
-
-// ---------- By level tab ----------
+// ── By level tab ──────────────────────────────────────────────────────────────
 
 function ByLevelTab({ rows }: { rows: LevelBreakdown[] }) {
   if (rows.length === 0) {
-    return <div className="text-sm text-muted-foreground">No level data.</div>
+    return <p className="text-sm text-muted-foreground">No level data.</p>
   }
   return (
-    <Table>
-      <TableHeader>
-        <TableRow>
-          <TableHead>Level</TableHead>
-          <TableHead>Product</TableHead>
-          <TableHead className="text-right">Cost contribution</TableHead>
-          <TableHead className="text-right">Ratio</TableHead>
-        </TableRow>
-      </TableHeader>
-      <TableBody>
-        {rows.map((r, idx) => (
-          <TableRow key={`${r.level}-${r.productSysId}-${idx}`}>
-            <TableCell>{r.level}</TableCell>
-            <TableCell>
-              <div className="flex flex-col">
-                <span className="font-mono text-xs text-muted-foreground">
-                  {r.productCode}
-                </span>
-                <span>{r.productName}</span>
-              </div>
-            </TableCell>
-            <TableCell className="text-right tabular-nums">
-              {formatNumeric(r.costContribution)}
-            </TableCell>
-            <TableCell className="text-right tabular-nums">
-              {formatNumeric(r.ratio)}
-            </TableCell>
+    <div className="overflow-x-auto rounded-md border">
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead className="w-16">Level</TableHead>
+            <TableHead>Product</TableHead>
+            <TableHead className="text-right">Cost contribution</TableHead>
+            <TableHead className="w-28 text-right">Ratio</TableHead>
           </TableRow>
-        ))}
-      </TableBody>
-    </Table>
+        </TableHeader>
+        <TableBody>
+          {rows.map((r, i) => (
+            <TableRow key={`${r.level}-${r.productSysId}-${i}`}>
+              <TableCell className="font-mono text-sm font-medium">{r.level}</TableCell>
+              <TableCell>
+                <p className="font-mono text-xs text-muted-foreground">{r.productCode}</p>
+                <p className="text-sm">{r.productName}</p>
+              </TableCell>
+              <TableCell className="text-right font-mono text-sm tabular-nums">
+                {formatNumeric(r.costContribution)}
+              </TableCell>
+              <TableCell className="text-right font-mono text-sm tabular-nums">
+                {formatNumeric(r.ratio)}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
   )
 }
 
-// ---------- RM breakdown tab ----------
+// ── RM breakdown tab ──────────────────────────────────────────────────────────
 
 function RmTab({ rows }: { rows: CostRmDetail[] }) {
   if (rows.length === 0) {
-    return <div className="text-sm text-muted-foreground">No RM data.</div>
+    return <p className="text-sm text-muted-foreground">No RM data.</p>
   }
   return (
-    <Table>
-      <TableHeader>
-        <TableRow>
-          <TableHead>RM Type</TableHead>
-          <TableHead>Ref</TableHead>
-          <TableHead>Shade</TableHead>
-          <TableHead className="text-right">Unit cost</TableHead>
-          <TableHead className="text-right">Ratio</TableHead>
-          <TableHead className="text-right">Contribution</TableHead>
-        </TableRow>
-      </TableHeader>
-      <TableBody>
-        {rows.map((r, idx) => (
-          <TableRow key={`${r.rmType}-${r.refCode}-${idx}`}>
-            <TableCell>
-              <Badge variant="outline">{r.rmType}</Badge>
-            </TableCell>
-            <TableCell>
-              <div className="flex flex-col">
-                <span className="font-mono text-xs text-muted-foreground">
-                  {r.refCode}
-                </span>
-                <span>{r.refLabel}</span>
-              </div>
-            </TableCell>
-            <TableCell className="font-mono text-xs">{r.shadeCode || "—"}</TableCell>
-            <TableCell className="text-right tabular-nums">
-              {formatNumeric(r.unitCost)}
-            </TableCell>
-            <TableCell className="text-right tabular-nums">
-              {formatNumeric(r.ratio)}
-            </TableCell>
-            <TableCell className="text-right tabular-nums font-semibold">
-              {formatNumeric(r.contribution)}
-            </TableCell>
+    <div className="overflow-x-auto rounded-md border">
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead className="w-24">Type</TableHead>
+            <TableHead>Reference</TableHead>
+            <TableHead>Shade</TableHead>
+            <TableHead className="text-right">Unit cost</TableHead>
+            <TableHead className="text-right">Ratio</TableHead>
+            <TableHead className="text-right">Contribution</TableHead>
           </TableRow>
-        ))}
-      </TableBody>
-    </Table>
+        </TableHeader>
+        <TableBody>
+          {rows.map((r, i) => (
+            <TableRow key={`${r.rmType}-${r.refCode}-${i}`}>
+              <TableCell>
+                <Badge variant="outline" className="font-mono text-xs font-normal">
+                  {r.rmType}
+                </Badge>
+              </TableCell>
+              <TableCell>
+                <p className="font-mono text-xs text-muted-foreground">{r.refCode}</p>
+                <p className="text-sm">{r.refLabel}</p>
+              </TableCell>
+              <TableCell className="font-mono text-xs text-muted-foreground">
+                {r.shadeCode || "—"}
+              </TableCell>
+              <TableCell className="text-right font-mono text-sm tabular-nums">
+                {formatNumeric(r.unitCost)}
+              </TableCell>
+              <TableCell className="text-right font-mono text-sm tabular-nums">
+                {formatNumeric(r.ratio)}
+              </TableCell>
+              <TableCell className="text-right font-mono text-sm font-semibold tabular-nums">
+                {formatNumeric(r.contribution)}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
   )
 }
 
-// ---------- Formula trace tab ----------
+// ── Formula trace tab — compact card per formula ──────────────────────────────
 
-function FormulaTraceTab({
-  rows,
-  paramSnapshot: _paramSnapshot,
-}: {
-  rows: FormulaEval[]
-  paramSnapshot: Record<string, string>
-}) {
-  void _paramSnapshot
+function FormulaTraceTab({ rows }: { rows: FormulaEval[] }) {
   if (rows.length === 0) {
-    return <div className="text-sm text-muted-foreground">No formula evaluations.</div>
+    return <p className="text-sm text-muted-foreground">No formula evaluations.</p>
   }
   return (
-    <div className="space-y-3">
-      {rows.map((f, idx) => {
-        const inputEntries = Object.entries(f.inputs ?? {})
-        return (
-          <Card key={`${f.formulaCode}-${idx}`}>
-            <CardHeader className="pb-2">
-              <CardTitle className="text-sm flex items-baseline justify-between gap-2">
-                <span>
-                  <span className="font-mono text-xs text-muted-foreground mr-2">
-                    {f.formulaCode}
-                  </span>
-                  {f.formulaName}
-                </span>
-                <span className="text-xs text-muted-foreground">
-                  → {f.outputParamCode}
-                </span>
-              </CardTitle>
-            </CardHeader>
-            <CardContent className="space-y-2">
-              <pre className="bg-muted/40 rounded px-3 py-2 text-xs overflow-x-auto">
-                <code>{f.expression}</code>
-              </pre>
-              {inputEntries.length > 0 && (
-                <div className="text-xs">
-                  <span className="text-muted-foreground mr-2">Inputs:</span>
-                  {inputEntries.map(([k, v], i) => (
-                    <span key={k} className="inline-block mr-3">
-                      <span className="font-mono text-muted-foreground">{k}</span>
-                      <span className="mx-1">=</span>
-                      <span className="font-mono tabular-nums">{v}</span>
-                      {i < inputEntries.length - 1 ? "" : ""}
-                    </span>
-                  ))}
-                </div>
-              )}
-              <div className="text-sm">
-                <span className="text-muted-foreground mr-2">Output:</span>
-                <span className="font-mono font-semibold tabular-nums">
-                  {formatNumeric(f.outputValue)}
-                </span>
-              </div>
-            </CardContent>
-          </Card>
-        )
-      })}
+    <div className="space-y-2">
+      {rows.map((f, i) => (
+        <FormulaCard key={`${f.formulaCode}-${i}`} formula={f} />
+      ))}
+    </div>
+  )
+}
+
+function FormulaCard({ formula: f }: { formula: FormulaEval }) {
+  const inputEntries = Object.entries(f.inputs ?? {})
+  return (
+    <div className="overflow-hidden rounded-lg border bg-card text-card-foreground">
+      {/* Card header row — code + output param */}
+      <div className="flex items-center justify-between gap-3 border-b bg-muted/40 px-4 py-2">
+        <div className="flex min-w-0 items-center gap-2">
+          <code className="shrink-0 font-mono text-xs font-medium text-foreground">
+            {f.formulaCode}
+          </code>
+          {f.formulaName && (
+            <span className="truncate text-xs text-muted-foreground">
+              · {f.formulaName}
+            </span>
+          )}
+        </div>
+        <div className="flex shrink-0 items-center gap-1 text-muted-foreground">
+          <ArrowRight className="h-3.5 w-3.5" />
+          <code className="font-mono text-xs">{f.outputParamCode}</code>
+        </div>
+      </div>
+
+      {/* Card body */}
+      <div className="space-y-2.5 px-4 py-3">
+        {/* Expression */}
+        <pre className="overflow-x-auto rounded-md bg-muted/50 px-3 py-2 font-mono text-xs leading-relaxed">
+          {f.expression}
+        </pre>
+
+        {/* Inputs — compact inline pairs */}
+        {inputEntries.length > 0 && (
+          <div className="flex flex-wrap gap-x-4 gap-y-1">
+            <span className="text-xs text-muted-foreground">Inputs:</span>
+            {inputEntries.map(([k, v]) => (
+              <span key={k} className="inline-flex items-center gap-1 text-xs">
+                <span className="font-mono text-muted-foreground">{k}</span>
+                <span className="text-muted-foreground/50">=</span>
+                <span className="font-mono font-medium tabular-nums">{v}</span>
+              </span>
+            ))}
+          </div>
+        )}
+
+        {/* Output */}
+        <div className="flex items-center gap-2 border-t pt-2 text-xs">
+          <span className="text-muted-foreground">Output</span>
+          <span className="font-mono text-sm font-semibold tabular-nums">
+            {formatNumeric(f.outputValue)}
+          </span>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+// ── Shared ────────────────────────────────────────────────────────────────────
+
+function Field({ label, children }: { label: string; children: React.ReactNode }) {
+  return (
+    <div className="space-y-1">
+      <dt className="text-xs text-muted-foreground">{label}</dt>
+      <dd>{children}</dd>
     </div>
   )
 }
diff --git a/src/components/finance/cost-results/cost-history-tab.tsx b/src/components/finance/cost-results/cost-history-tab.tsx
index 6dde1ef..90c075d 100644
--- a/src/components/finance/cost-results/cost-history-tab.tsx
+++ b/src/components/finance/cost-results/cost-history-tab.tsx
@@ -2,7 +2,6 @@
 
 import { useState } from "react"
 
-import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import {
   Table,
@@ -12,6 +11,8 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table"
+import { StatusBadge } from "@/components/common/status-badge"
+import { UserName } from "@/components/common/user-name"
 import { useCostHistory } from "@/hooks/finance/use-cost-calc"
 import type { CalculationType } from "@/types/finance/cost-calc"
 
@@ -19,7 +20,7 @@ import { formatDate, formatNumeric } from "./format"
 
 interface Props {
   productSysId: number
-  calcType?: CalculationType // optional filter; undefined = all types
+  calcType?: CalculationType
 }
 
 export function CostHistoryTab({ productSysId, calcType }: Props) {
@@ -31,57 +32,67 @@ export function CostHistoryTab({ productSysId, calcType }: Props) {
   })
 
   if (isLoading) {
-    return <div className="text-sm text-muted-foreground">Loading…</div>
+    return (
+      <div className="flex items-center gap-2 py-4 text-sm text-muted-foreground">
+        Loading…
+      </div>
+    )
   }
   if (!data || data.items.length === 0) {
-    return <div className="text-sm text-muted-foreground">No history yet.</div>
+    return <div className="py-2 text-sm text-muted-foreground">No history yet.</div>
   }
 
   return (
     <div className="space-y-4">
-      <Table>
-        <TableHeader>
-          <TableRow>
-            <TableHead>Period</TableHead>
-            <TableHead>Type</TableHead>
-            <TableHead>Version</TableHead>
-            <TableHead className="text-right">Cost per unit</TableHead>
-            <TableHead className="text-right">Variance</TableHead>
-            <TableHead>Status</TableHead>
-            <TableHead>Calculated</TableHead>
-            <TableHead>By</TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {data.items.map((row) => (
-            <TableRow key={row.costId}>
-              <TableCell className="font-mono">{row.period}</TableCell>
-              <TableCell>{row.calculationType}</TableCell>
-              <TableCell>v{row.version}</TableCell>
-              <TableCell className="text-right tabular-nums">
-                {formatNumeric(row.costPerUnit)}
-              </TableCell>
-              <TableCell className="text-right tabular-nums">
-                <VarianceCell value={row.variancePctFromPrevious} />
-              </TableCell>
-              <TableCell>
-                <Badge variant={row.status === "SUPERSEDED" ? "outline" : "default"}>
-                  {row.status}
-                </Badge>
-              </TableCell>
-              <TableCell>{formatDate(row.calculatedAt)}</TableCell>
-              <TableCell>{row.calculatedBy}</TableCell>
+      <div className="overflow-x-auto">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Period</TableHead>
+              <TableHead>Type</TableHead>
+              <TableHead>Version</TableHead>
+              <TableHead className="text-right">Cost per unit</TableHead>
+              <TableHead className="text-right">Variance</TableHead>
+              <TableHead>Status</TableHead>
+              <TableHead>Calculated</TableHead>
+              <TableHead>By</TableHead>
             </TableRow>
-          ))}
-        </TableBody>
-      </Table>
+          </TableHeader>
+          <TableBody>
+            {data.items.map((row) => (
+              <TableRow key={row.costId}>
+                <TableCell className="font-mono text-sm">{row.period}</TableCell>
+                <TableCell className="text-sm">{row.calculationType}</TableCell>
+                <TableCell className="font-mono text-sm">v{row.version}</TableCell>
+                <TableCell className="text-right font-mono text-sm tabular-nums">
+                  {formatNumeric(row.costPerUnit)}
+                </TableCell>
+                <TableCell className="text-right tabular-nums">
+                  <VarianceCell value={row.variancePctFromPrevious} />
+                </TableCell>
+                <TableCell>
+                  <StatusBadge status={row.status} type="cost" size="sm" />
+                </TableCell>
+                <TableCell className="text-sm">{formatDate(row.calculatedAt)}</TableCell>
+                <TableCell className="text-sm">
+                  {row.calculatedBy ? (
+                    <UserName userId={row.calculatedBy} compact />
+                  ) : (
+                    "—"
+                  )}
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
 
       {data.totalPages > 1 && (
         <div className="flex items-center justify-between">
           <div className="text-xs text-muted-foreground">
             Page {page} of {data.totalPages}
           </div>
-          <div className="space-x-2">
+          <div className="flex gap-2">
             <Button
               variant="outline"
               size="sm"
diff --git a/src/components/finance/cost-results/cost-result-detail.tsx b/src/components/finance/cost-results/cost-result-detail.tsx
index e114578..4e79258 100644
--- a/src/components/finance/cost-results/cost-result-detail.tsx
+++ b/src/components/finance/cost-results/cost-result-detail.tsx
@@ -1,16 +1,23 @@
 "use client"
 
 import { useState } from "react"
-import { CheckCircle2, ShieldCheck } from "lucide-react"
+import { useRouter } from "next/navigation"
+import { ArrowLeft, BarChart3, CheckCircle2, ShieldCheck } from "lucide-react"
 
-import { Badge } from "@/components/ui/badge"
+import { PageHeader } from "@/components/common/page-header"
+import { StatusBadge } from "@/components/common/status-badge"
+import { UserName } from "@/components/common/user-name"
+import { EmptyState } from "@/components/common/empty-state"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Separator } from "@/components/ui/separator"
+import { Skeleton } from "@/components/ui/skeleton"
 import {
   useApproveCost,
   useCostResult,
   useVerifyCost,
 } from "@/hooks/finance/use-cost-calc"
+import { useCostProductMaster } from "@/hooks/finance/use-cost-product-master"
 import { usePermissionContext } from "@/providers/permission-provider"
 import type { CalculationType } from "@/types/finance/cost-calc"
 
@@ -25,89 +32,213 @@ interface Props {
 }
 
 export function CostResultDetail({ productSysId, period, calcType }: Props) {
+  const router = useRouter()
   const [modalOpen, setModalOpen] = useState(false)
   const { hasPermission } = usePermissionContext()
   const { data: result, isLoading } = useCostResult(productSysId, period, calcType)
   const verify = useVerifyCost()
   const approve = useApproveCost()
 
+  // GetCostResult gRPC may return empty productCode/productName — fall back to product master.
+  const needsProductFallback = result != null && (!result.productCode || !result.productName)
+  const { data: productMaster } = useCostProductMaster(needsProductFallback ? productSysId : undefined)
+  const productCode = result?.productCode || productMaster?.productCode || `#${productSysId}`
+  const productName = result?.productName || productMaster?.productName || ""
+
+  function backToList() {
+    router.push("/finance/cost-results")
+  }
+
   if (isLoading) {
-    return <div className="text-sm text-muted-foreground">Loading…</div>
+    return (
+      <div className="space-y-6">
+        <div className="flex flex-col gap-2 pb-2 md:flex-row md:items-center md:justify-between">
+          <div className="space-y-2">
+            <Skeleton className="h-4 w-24" />
+            <Skeleton className="h-7 w-64" />
+            <Skeleton className="h-4 w-48" />
+          </div>
+          <Skeleton className="h-9 w-32" />
+        </div>
+        <div className="grid grid-cols-1 gap-6 lg:grid-cols-12">
+          <div className="space-y-6 lg:col-span-8">
+            <Skeleton className="h-52 w-full rounded-lg" />
+            <Skeleton className="h-64 w-full rounded-lg" />
+          </div>
+          <div className="lg:col-span-4">
+            <Skeleton className="h-72 w-full rounded-lg" />
+          </div>
+        </div>
+      </div>
+    )
   }
+
   if (!result) {
     return (
-      <div className="rounded-md border bg-muted/30 p-8 text-center text-sm text-muted-foreground">
-        No active cost result for {period} / {calcType}. Trigger a calc job to compute
-        one.
+      <div className="space-y-6">
+        <PageHeader title="Cost Result" subtitle={`Period ${period} · ${calcType}`}>
+          <Button variant="outline" onClick={backToList}>
+            <ArrowLeft className="mr-2 h-4 w-4" /> Back to list
+          </Button>
+        </PageHeader>
+        <EmptyState
+          title="No cost result found"
+          description={`No active cost result for period ${period} / ${calcType}. Trigger a calc job to compute one.`}
+          action={
+            <Button variant="outline" onClick={() => router.push("/finance/calc-jobs")}>
+              Go to calc jobs
+            </Button>
+          }
+        />
       </div>
     )
   }
 
-  const canVerify =
-    result.status === "CALCULATED" && hasPermission("finance.cost.result.verify")
-  const canApprove =
-    result.status === "VERIFIED" && hasPermission("finance.cost.result.approve")
+  const canVerify = result.status === "CALCULATED" && hasPermission("finance.cost.result.verify")
+  const canApprove = result.status === "VERIFIED" && hasPermission("finance.cost.result.approve")
 
   return (
     <div className="space-y-6">
-      <Card>
-        <CardHeader>
-          <CardTitle>
-            <span className="font-mono text-sm text-muted-foreground mr-2">
-              {result.productCode}
-            </span>
-            {result.productName}
-          </CardTitle>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <div className="grid grid-cols-2 gap-4 md:grid-cols-4">
-            <Stat
-              label="Cost per unit"
-              value={`${result.currencyCode || ""} ${formatNumeric(result.costPerUnit)}`.trim()}
-              highlight
-            />
-            <Stat label="Total RM cost" value={formatNumeric(result.totalRmCost)} />
-            <Stat label="Conversion" value={formatNumeric(result.totalConversion)} />
-            <Stat label="Total cost" value={formatNumeric(result.totalCost)} />
-            <Stat label="Version" value={`v${result.version}`} />
-            <Stat label="Status" value={<Badge>{result.status}</Badge>} />
-            <Stat label="Calculated" value={formatDate(result.calculatedAt)} />
-            <Stat label="By" value={result.calculatedBy || "—"} />
-          </div>
-          <div className="flex flex-wrap gap-2">
-            <Button variant="outline" onClick={() => setModalOpen(true)}>
-              View breakdown
-            </Button>
-            {canVerify && (
-              <Button
-                onClick={() => verify.mutate({ costId: result.costId })}
-                disabled={verify.isPending}
-              >
-                <CheckCircle2 className="mr-2 h-4 w-4" />
-                {verify.isPending ? "Verifying…" : "Mark verified"}
-              </Button>
-            )}
-            {canApprove && (
-              <Button
-                onClick={() => approve.mutate({ costId: result.costId })}
-                disabled={approve.isPending}
-              >
-                <ShieldCheck className="mr-2 h-4 w-4" />
-                {approve.isPending ? "Approving…" : "Mark approved"}
-              </Button>
-            )}
-          </div>
-        </CardContent>
-      </Card>
-
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">History (all versions)</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <CostHistoryTab productSysId={productSysId} calcType={calcType} />
-        </CardContent>
-      </Card>
+      <PageHeader
+        title={productCode}
+        subtitle={[productName, `Period ${period} · ${calcType}`].filter(Boolean).join("  ·  ")}
+      >
+        <Button variant="outline" onClick={backToList}>
+          <ArrowLeft className="mr-2 h-4 w-4" /> Back to list
+        </Button>
+      </PageHeader>
+
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-12">
+        {/* Left column */}
+        <div className="min-w-0 space-y-6 lg:col-span-8">
+
+          {/* Main cost card */}
+          <Card>
+            <CardHeader>
+              <div className="flex items-start justify-between">
+                <div className="space-y-1">
+                  <p className="font-mono text-xs text-muted-foreground">{productCode}</p>
+                  {productName && (
+                    <CardTitle className="text-sm font-semibold">{productName}</CardTitle>
+                  )}
+                </div>
+                <StatusBadge status={result.status} type="cost" />
+              </div>
+            </CardHeader>
+            <CardContent className="space-y-4">
+              <div className="grid grid-cols-2 gap-4 text-sm md:grid-cols-4">
+                <Field label="Cost per unit">
+                  <span className="text-xl font-semibold tabular-nums">
+                    {result.currencyCode ? `${result.currencyCode} ` : ""}
+                    {formatNumeric(result.costPerUnit)}
+                  </span>
+                </Field>
+                <Field label="Total RM cost">
+                  <span className="font-mono tabular-nums">
+                    {formatNumeric(result.totalRmCost)}
+                  </span>
+                </Field>
+                <Field label="Conversion">
+                  <span className="font-mono tabular-nums">
+                    {formatNumeric(result.totalConversion)}
+                  </span>
+                </Field>
+                <Field label="Total cost">
+                  <span className="font-mono font-semibold tabular-nums">
+                    {formatNumeric(result.totalCost)}
+                  </span>
+                </Field>
+              </div>
+
+              <div className="border-t pt-4">
+                <div className="flex flex-wrap gap-2">
+                  <Button variant="outline" onClick={() => setModalOpen(true)}>
+                    <BarChart3 className="mr-2 h-4 w-4" />
+                    View breakdown
+                  </Button>
+                  {canVerify && (
+                    <Button
+                      onClick={() => verify.mutate({ costId: result.costId })}
+                      disabled={verify.isPending}
+                    >
+                      <CheckCircle2 className="mr-2 h-4 w-4" />
+                      {verify.isPending ? "Verifying…" : "Mark verified"}
+                    </Button>
+                  )}
+                  {canApprove && (
+                    <Button
+                      onClick={() => approve.mutate({ costId: result.costId })}
+                      disabled={approve.isPending}
+                    >
+                      <ShieldCheck className="mr-2 h-4 w-4" />
+                      {approve.isPending ? "Approving…" : "Mark approved"}
+                    </Button>
+                  )}
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+
+          {/* History card */}
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-sm font-semibold">Calculation history</CardTitle>
+            </CardHeader>
+            <CardContent>
+              <CostHistoryTab productSysId={productSysId} calcType={calcType} />
+            </CardContent>
+          </Card>
+        </div>
+
+        {/* Right column — audit sidebar */}
+        <div className="min-w-0 space-y-6 lg:col-span-4">
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-sm font-semibold">Audit trail</CardTitle>
+            </CardHeader>
+            <CardContent className="space-y-3">
+              <Field label="Version">
+                <span className="font-mono text-sm">v{result.version}</span>
+              </Field>
+              <Field label="Period">
+                <span className="font-mono text-sm">{result.period}</span>
+              </Field>
+              <Field label="Calc type">
+                <span className="text-sm">{result.calculationType}</span>
+              </Field>
+              {result.uomCode && (
+                <Field label="UOM">
+                  <span className="font-mono text-sm">{result.uomCode}</span>
+                </Field>
+              )}
+              <Separator />
+              {result.calculatedAt && (
+                <Field label="Calculated at">
+                  <span className="text-sm">{formatDate(result.calculatedAt)}</span>
+                </Field>
+              )}
+              {result.calculatedBy && (
+                <Field label="Calculated by">
+                  <UserName userId={result.calculatedBy} compact className="text-sm" />
+                </Field>
+              )}
+              {result.verifiedAt && (
+                <>
+                  <Separator />
+                  <Field label="Verified at">
+                    <span className="text-sm">{formatDate(result.verifiedAt)}</span>
+                  </Field>
+                </>
+              )}
+              {result.verifiedBy && (
+                <Field label="Verified by">
+                  <UserName userId={result.verifiedBy} compact className="text-sm" />
+                </Field>
+              )}
+            </CardContent>
+          </Card>
+        </div>
+      </div>
 
       <CostBreakdownModal
         open={modalOpen}
@@ -120,21 +251,11 @@ export function CostResultDetail({ productSysId, period, calcType }: Props) {
   )
 }
 
-function Stat({
-  label,
-  value,
-  highlight,
-}: {
-  label: string
-  value: React.ReactNode
-  highlight?: boolean
-}) {
+function Field({ label, children }: { label: string; children: React.ReactNode }) {
   return (
-    <div>
-      <div className="text-xs text-muted-foreground">{label}</div>
-      <div className={highlight ? "text-2xl font-semibold tabular-nums" : "text-sm"}>
-        {value}
-      </div>
+    <div className="space-y-1">
+      <dt className="text-xs text-muted-foreground">{label}</dt>
+      <dd>{children}</dd>
     </div>
   )
 }
diff --git a/src/components/finance/cost-results/cost-results-page-client.tsx b/src/components/finance/cost-results/cost-results-page-client.tsx
index 97e3253..51cac27 100644
--- a/src/components/finance/cost-results/cost-results-page-client.tsx
+++ b/src/components/finance/cost-results/cost-results-page-client.tsx
@@ -11,6 +11,8 @@ import { KpiCard, KpiGrid } from "@/components/common"
 import { StatusBadge } from "@/components/common/status-badge"
 import { UserName } from "@/components/common/user-name"
 import { Button } from "@/components/ui/button"
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
+import { Input } from "@/components/ui/input"
 import {
   Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
 } from "@/components/ui/select"
@@ -31,8 +33,6 @@ interface FiltersState {
   pageSize: number
 }
 
-// Default view: latest period, ACTUAL, active rows — NO forced filters. Users
-// narrow from here. The backend resolves the latest period when none is given.
 const defaultFilters: FiltersState = {
   period: "",
   calcType: "ACTUAL",
@@ -83,135 +83,201 @@ export function CostResultsPageClient() {
   }, [items, totalItems])
 
   return (
-    <div className="space-y-6">
+    <div className="w-full min-w-0 space-y-5">
       <PageHeader
-        title="Cost results"
+        title="Cost Results"
         subtitle={`Per-product unit costs · ${resolvedPeriod}`}
       />
 
       <KpiGrid>
-        <KpiCard title="Results (period)" value={kpis.total.toLocaleString()} icon={ListChecks} />
-        <KpiCard title="Shown on page" value={kpis.onPage} icon={Layers} />
-        <KpiCard title="Verified / approved" value={kpis.verified} icon={CheckCircle2} variant="success" />
+        <KpiCard
+          title="Results (period)"
+          value={kpis.total.toLocaleString()}
+          icon={ListChecks}
+          loading={isLoading}
+        />
+        <KpiCard
+          title="Shown on page"
+          value={kpis.onPage}
+          icon={Layers}
+          loading={isLoading}
+        />
+        <KpiCard
+          title="Verified / approved"
+          value={kpis.verified}
+          icon={CheckCircle2}
+          variant="success"
+          loading={isLoading}
+        />
         <KpiCard
           title="Avg cost / unit"
           value={kpis.avg.toLocaleString("en-US", { maximumFractionDigits: 2 })}
           icon={Calculator}
+          loading={isLoading}
         />
       </KpiGrid>
 
-      <div className="grid grid-cols-1 gap-3 md:grid-cols-4">
-        <DebouncedSearchInput
-          value={filters.search}
-          onValueChange={(search) => setFilters({ ...filters, search, page: 1 })}
-          placeholder="Search product code or name…"
-        />
-        <Input6Period value={filters.period} onChange={(period) => setFilters({ ...filters, period, page: 1 })} />
-        <Select
-          value={filters.calcType || "ALL"}
-          onValueChange={(v) => setFilters({ ...filters, calcType: v === "ALL" ? "" : v, page: 1 })}
-        >
-          <SelectTrigger><SelectValue placeholder="Calc type" /></SelectTrigger>
-          <SelectContent>
-            <SelectItem value="ALL">All types</SelectItem>
-            {CALC_TYPES.map((t) => <SelectItem key={t} value={t}>{t}</SelectItem>)}
-          </SelectContent>
-        </Select>
-        <Select
-          value={filters.status || "ALL"}
-          onValueChange={(v) => setFilters({ ...filters, status: v === "ALL" ? "" : v, page: 1 })}
-        >
-          <SelectTrigger><SelectValue placeholder="Status" /></SelectTrigger>
-          <SelectContent>
-            <SelectItem value="ALL">Active (default)</SelectItem>
-            {STATUSES.map((s) => <SelectItem key={s} value={s}>{s}</SelectItem>)}
-          </SelectContent>
-        </Select>
-      </div>
-
-      {isLoading ? (
-        <div className="space-y-2">
-          {Array.from({ length: 8 }).map((_, i) => <Skeleton key={i} className="h-10 w-full" />)}
-        </div>
-      ) : items.length === 0 ? (
-        <EmptyState
-          title="No cost results"
-          description="No calculated cost rows for this period/filter. Trigger a calculation from a product or calc job."
-          action={<Button asChild variant="outline"><Link href="/finance/calc-jobs">Go to calc jobs</Link></Button>}
-        />
-      ) : (
-        <div className="rounded-md border">
-          <Table>
-            <TableHeader>
-              <TableRow>
-                <TableHead>Product</TableHead>
-                <TableHead className="hidden md:table-cell">Type</TableHead>
-                <TableHead className="text-right">Cost / unit</TableHead>
-                <TableHead className="hidden lg:table-cell text-right">RM</TableHead>
-                <TableHead className="hidden lg:table-cell text-right">Conversion</TableHead>
-                <TableHead className="text-right">Total</TableHead>
-                <TableHead>Status</TableHead>
-                <TableHead className="hidden xl:table-cell">By</TableHead>
-              </TableRow>
-            </TableHeader>
-            <TableBody>
-              {items.map((r) => (
-                <TableRow key={r.costId}>
-                  <TableCell>
-                    <Link
-                      href={`/finance/cost-results/${r.productSysId}/${r.period}/${r.calculationType}`}
-                      className="font-mono text-sm font-medium text-primary hover:underline"
-                    >
-                      {r.productCode || `#${r.productSysId}`}
-                    </Link>
-                    {r.productName && (
-                      <div className="text-xs text-muted-foreground">{r.productName}</div>
-                    )}
-                  </TableCell>
-                  <TableCell className="hidden md:table-cell text-sm">{r.calculationType}</TableCell>
-                  <TableCell className="text-right font-mono text-sm">{fmtMoney(r.costPerUnit)}</TableCell>
-                  <TableCell className="hidden lg:table-cell text-right font-mono text-sm">{fmtMoney(r.totalRmCost)}</TableCell>
-                  <TableCell className="hidden lg:table-cell text-right font-mono text-sm">{fmtMoney(r.totalConversion)}</TableCell>
-                  <TableCell className="text-right font-mono text-sm font-semibold">{fmtMoney(r.totalCost)}</TableCell>
-                  <TableCell><StatusBadge status={r.status} type="cost" size="sm" /></TableCell>
-                  <TableCell className="hidden xl:table-cell text-sm">
-                    {r.calculatedBy ? <UserName userId={r.calculatedBy} /> : "—"}
-                  </TableCell>
-                </TableRow>
+      <Card className="min-w-0">
+        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-4">
+          <div>
+            <CardTitle className="text-sm font-semibold">Result list</CardTitle>
+            <CardDescription className="mt-0.5">
+              {isLoading ? "Loading…" : `${totalItems.toLocaleString()} total results`}
+            </CardDescription>
+          </div>
+        </CardHeader>
+
+        <CardContent className="space-y-3 pt-0">
+          {/* Filter bar */}
+          <div className="flex flex-wrap items-center gap-2">
+            <DebouncedSearchInput
+              containerClassName="flex-1 min-w-[180px]"
+              value={filters.search}
+              onValueChange={(search) => setFilters({ ...filters, search, page: 1 })}
+              placeholder="Search product code or name…"
+            />
+            <Input6Period
+              value={filters.period}
+              onChange={(period) => setFilters({ ...filters, period, page: 1 })}
+            />
+            <Select
+              value={filters.calcType || "ALL"}
+              onValueChange={(v) => setFilters({ ...filters, calcType: v === "ALL" ? "" : v, page: 1 })}
+            >
+              <SelectTrigger className="h-9 w-[140px]">
+                <SelectValue placeholder="Calc type" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="ALL">All types</SelectItem>
+                {CALC_TYPES.map((t) => (
+                  <SelectItem key={t} value={t}>{t}</SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <Select
+              value={filters.status || "ALL"}
+              onValueChange={(v) => setFilters({ ...filters, status: v === "ALL" ? "" : v, page: 1 })}
+            >
+              <SelectTrigger className="h-9 w-[160px]">
+                <SelectValue placeholder="Status" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="ALL">Active (default)</SelectItem>
+                {STATUSES.map((s) => (
+                  <SelectItem key={s} value={s}>{s}</SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+
+          {/* Table or empty states */}
+          {isLoading ? (
+            <div className="space-y-2">
+              {Array.from({ length: 8 }).map((_, i) => (
+                <Skeleton key={i} className="h-10 w-full" />
               ))}
-            </TableBody>
-          </Table>
-        </div>
-      )}
-
-      {totalItems > 0 && (
-        <DataTablePagination
-          currentPage={Number(pagination?.currentPage ?? 1)}
-          pageSize={Number(pagination?.pageSize ?? 50)}
-          totalItems={totalItems}
-          totalPages={Number(pagination?.totalPages ?? 0)}
-          onPageChange={(page) => setFilters({ ...filters, page })}
-          onPageSizeChange={(pageSize) => setFilters({ ...filters, pageSize, page: 1 })}
-        />
-      )}
+            </div>
+          ) : items.length === 0 ? (
+            <EmptyState
+              title="No cost results"
+              description="No calculated cost rows for this period/filter. Trigger a calculation from a product or calc job."
+              action={
+                <Button asChild variant="outline">
+                  <Link href="/finance/calc-jobs">Go to calc jobs</Link>
+                </Button>
+              }
+            />
+          ) : (
+            <div className="overflow-x-auto rounded-md border">
+              <Table>
+                <TableHeader>
+                  <TableRow>
+                    <TableHead>Product</TableHead>
+                    <TableHead className="hidden md:table-cell">Type</TableHead>
+                    <TableHead className="text-right">Cost / unit</TableHead>
+                    <TableHead className="hidden lg:table-cell text-right">RM</TableHead>
+                    <TableHead className="hidden lg:table-cell text-right">Conversion</TableHead>
+                    <TableHead className="text-right">Total</TableHead>
+                    <TableHead>Status</TableHead>
+                    <TableHead className="hidden xl:table-cell">By</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {items.map((r) => (
+                    <TableRow key={r.costId}>
+                      <TableCell>
+                        <Link
+                          href={`/finance/cost-results/${r.productSysId}/${r.period}/${r.calculationType}`}
+                          className="font-mono text-sm font-medium text-primary hover:underline"
+                        >
+                          {r.productCode || `#${r.productSysId}`}
+                        </Link>
+                        {r.productName && (
+                          <div className="text-xs text-muted-foreground">{r.productName}</div>
+                        )}
+                      </TableCell>
+                      <TableCell className="hidden md:table-cell text-sm">
+                        {r.calculationType}
+                      </TableCell>
+                      <TableCell className="text-right font-mono text-sm tabular-nums">
+                        {fmtMoney(r.costPerUnit)}
+                      </TableCell>
+                      <TableCell className="hidden lg:table-cell text-right font-mono text-sm tabular-nums">
+                        {fmtMoney(r.totalRmCost)}
+                      </TableCell>
+                      <TableCell className="hidden lg:table-cell text-right font-mono text-sm tabular-nums">
+                        {fmtMoney(r.totalConversion)}
+                      </TableCell>
+                      <TableCell className="text-right font-mono text-sm font-semibold tabular-nums">
+                        {fmtMoney(r.totalCost)}
+                      </TableCell>
+                      <TableCell>
+                        <StatusBadge status={r.status} type="cost" size="sm" />
+                      </TableCell>
+                      <TableCell className="hidden xl:table-cell text-sm">
+                        {r.calculatedBy ? (
+                          <UserName userId={r.calculatedBy} compact />
+                        ) : (
+                          "—"
+                        )}
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </div>
+          )}
+
+          {totalItems > 0 && (
+            <DataTablePagination
+              currentPage={Number(pagination?.currentPage ?? 1)}
+              pageSize={Number(pagination?.pageSize ?? 50)}
+              totalItems={totalItems}
+              totalPages={Number(pagination?.totalPages ?? 0)}
+              onPageChange={(page) => setFilters({ ...filters, page })}
+              onPageSizeChange={(pageSize) => setFilters({ ...filters, pageSize, page: 1 })}
+            />
+          )}
+        </CardContent>
+      </Card>
     </div>
   )
 }
 
-// Input6Period is a tiny YYYYMM text input that only commits 6-digit values.
+// Period input — 6-digit YYYYMM that only commits on blur when valid.
 function Input6Period({ value, onChange }: { value: string; onChange: (v: string) => void }) {
   return (
-    <input
+    <Input
       type="text"
       inputMode="numeric"
       maxLength={6}
-      placeholder="Period YYYYMM (default: this year)"
+      placeholder="Period YYYYMM"
       defaultValue={value}
+      className="h-9 w-[148px]"
       onBlur={(e) => {
         const v = e.target.value.trim()
         if (v === "" || /^[0-9]{6}$/.test(v)) onChange(v)
       }}
-      className="h-9 rounded-md border border-input bg-transparent px-3 text-sm shadow-xs outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
     />
   )
 }
diff --git a/src/components/finance/cost-route/route-graph-editor.tsx b/src/components/finance/cost-route/route-graph-editor.tsx
index 731ec71..0567706 100644
--- a/src/components/finance/cost-route/route-graph-editor.tsx
+++ b/src/components/finance/cost-route/route-graph-editor.tsx
@@ -3,7 +3,7 @@
 // RouteGraphEditor — level-based editor for cost_route_seq + cost_route_rm.
 //
 // Model is level-based (1 = FG, 2..N = upstream). Each level renders as a row
-// of stage cards; each card lists its RM inputs (PRODUCT / ITEM / GROUP).
+// of stage cards; each card lists its RM inputs (PRODUCT / GROUP).
 //
 // **UX rule (enforced):** users NEVER see or type a UUID / sys_id. Every
 // reference is picked via a combobox keyed on human-readable code/name.
@@ -24,7 +24,6 @@ import {
 import Link from "next/link"
 
 import { CalculateButton } from "@/components/finance/calc-jobs/calculate-button"
-import { ErpItemCombobox } from "@/components/finance/comboboxes/erp-item-combobox"
 import { ProductMasterCombobox } from "@/components/finance/comboboxes/product-master-combobox"
 import { DuplicateRouteDialog } from "@/components/finance/cost-route/duplicate-route-dialog"
 import { LinkedRequestsPopover } from "@/components/finance/cost-route/linked-requests-popover"
@@ -45,6 +44,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
+import { Textarea } from "@/components/ui/textarea"
 import {
   Select,
   SelectContent,
@@ -156,6 +156,7 @@ export function RouteGraphEditor({ headId }: Props) {
     productSysId: number,
     productCode?: string,
     productName?: string,
+    meta?: { routeName?: string; routeItemCode?: string; routeShadeCode?: string; routeShadeName?: string },
   ): { newSeqIdx: number } => {
     let newSeqIdx = -1
     setWorking((prev) => {
@@ -170,6 +171,10 @@ export function RouteGraphEditor({ headId }: Props) {
         productName,
         routeLevel: level,
         routeSeq: existing + 1,
+        routeName: meta?.routeName || undefined,
+        routeItemCode: meta?.routeItemCode || undefined,
+        routeShadeCode: meta?.routeShadeCode || undefined,
+        routeShadeName: meta?.routeShadeName || undefined,
         positionX: 0,
         positionY: 0,
         rms: [],
@@ -206,6 +211,15 @@ export function RouteGraphEditor({ headId }: Props) {
     setDirty(true)
   }
 
+  const setHeadNotes = (notes: string) => {
+    setWorking((prev) => {
+      const base = prev ?? (persisted ? (JSON.parse(JSON.stringify(persisted)) as RouteGraph) : null)
+      if (!base) return prev
+      return { ...base, head: { ...base.head, notes } }
+    })
+    setDirty(true)
+  }
+
   const deleteRm = (seqIdx: number, rmIdx: number) => {
     setWorking((prev) => {
       const base = prev ?? (persisted ? (JSON.parse(JSON.stringify(persisted)) as RouteGraph) : null)
@@ -361,6 +375,19 @@ export function RouteGraphEditor({ headId }: Props) {
             <span>version v{head?.version}</span>
             {head?.promotedFromDraftId ? <span>· promoted from a routing draft</span> : null}
           </div>
+          {!locked && (
+            <div className="mt-2">
+              <Textarea
+                placeholder="Routing notes (optional)…"
+                className="h-14 resize-none text-xs"
+                value={head?.notes ?? ""}
+                onChange={(e) => setHeadNotes(e.target.value)}
+              />
+            </div>
+          )}
+          {locked && head?.notes && (
+            <p className="mt-2 text-xs text-muted-foreground whitespace-pre-wrap">{head.notes}</p>
+          )}
         </div>
         <div className="flex flex-wrap gap-2">
           <LinkedRequestsPopover headId={headId} />
@@ -593,8 +620,8 @@ export function RouteGraphEditor({ headId }: Props) {
         onClose={() => setStageDialogState({ open: false })}
         existingLevels={seqsByLevel.map((g) => g.level)}
         defaultLevel={stageDialogState.defaultLevel}
-        onAdd={(level, productSysId, productCode, productName) => {
-          const { newSeqIdx } = addStage(level, productSysId, productCode, productName)
+        onAdd={(level, productSysId, productCode, productName, meta) => {
+          const { newSeqIdx } = addStage(level, productSysId, productCode, productName, meta)
           // F3 link-after-add: if we opened the dialog by dropping on the pane,
           // wire a PRODUCT-RM between the source seq and the newly-created seq.
           if (stageDialogState.open && stageDialogState.linkToSeqId !== undefined && newSeqIdx >= 0) {
@@ -749,12 +776,16 @@ function AddStageDialog({
   onClose: () => void
   existingLevels: number[]
   defaultLevel?: number
-  onAdd: (level: number, productSysId: number, productCode?: string, productName?: string) => void
+  onAdd: (level: number, productSysId: number, productCode?: string, productName?: string, meta?: { routeName?: string; routeItemCode?: string; routeShadeCode?: string; routeShadeName?: string }) => void
 }) {
   const nextLevel =
     defaultLevel ?? (existingLevels.length === 0 ? 1 : Math.max(...existingLevels) + 1)
   const [level, setLevel] = useState<number>(nextLevel)
   const [picked, setPicked] = useState<{ id: number; code: string; name: string } | null>(null)
+  const [routeName, setRouteName] = useState("")
+  const [routeItemCode, setRouteItemCode] = useState("")
+  const [routeShadeCode, setRouteShadeCode] = useState("")
+  const [routeShadeName, setRouteShadeName] = useState("")
 
   return (
     <Dialog open={open} onOpenChange={(o) => !o && onClose()}>
@@ -787,12 +818,45 @@ function AddStageDialog({
               The product this stage produces (intermediate or FG).
             </p>
           </div>
+          <details className="text-xs">
+            <summary className="cursor-pointer text-muted-foreground select-none">Additional metadata (optional)</summary>
+            <div className="mt-2 grid grid-cols-2 gap-2">
+              <div>
+                <Label className="text-xs">Route name</Label>
+                <Input value={routeName} onChange={(e) => setRouteName(e.target.value)} placeholder="e.g. Main spin" className="h-8 text-xs" />
+              </div>
+              <div>
+                <Label className="text-xs">ERP item code</Label>
+                <Input value={routeItemCode} onChange={(e) => setRouteItemCode(e.target.value)} placeholder="e.g. ACY0000001" className="h-8 text-xs" />
+              </div>
+              <div>
+                <Label className="text-xs">Shade code</Label>
+                <Input value={routeShadeCode} onChange={(e) => setRouteShadeCode(e.target.value)} placeholder="NL" className="h-8 text-xs" />
+              </div>
+              <div>
+                <Label className="text-xs">Shade name</Label>
+                <Input value={routeShadeName} onChange={(e) => setRouteShadeName(e.target.value)} placeholder="NATURAL" className="h-8 text-xs" />
+              </div>
+            </div>
+          </details>
         </div>
         <DialogFooter>
           <Button variant="ghost" onClick={onClose}>
             Cancel
           </Button>
-          <Button disabled={!picked} onClick={() => picked && onAdd(level, picked.id, picked.code, picked.name)}>
+          <Button
+            disabled={!picked}
+            onClick={() => {
+              if (!picked) return
+              const meta = {
+                routeName: routeName || undefined,
+                routeItemCode: routeItemCode || undefined,
+                routeShadeCode: routeShadeCode || undefined,
+                routeShadeName: routeShadeName || undefined,
+              }
+              onAdd(level, picked.id, picked.code, picked.name, meta)
+            }}
+          >
             Add stage
           </Button>
         </DialogFooter>
@@ -825,17 +889,18 @@ function AddRmDialog({
   upstreamProducts: UpstreamProduct[]
   onAdd: (rm: CostRouteRm) => void
 }) {
-  const [rmType, setRmType] = useState<RmRefType>("ITEM")
+  const [rmType, setRmType] = useState<RmRefType>("PRODUCT")
   const [productPick, setProductPick] = useState<UpstreamProduct | null>(null)
-  const [itemPick, setItemPick] = useState<{ code: string; name: string } | null>(null)
   const [groupPick, setGroupPick] = useState<{ code: string; name: string } | null>(null)
   const [ratio, setRatio] = useState("1")
   const [subType, setSubType] = useState("")
+  const [shadeCode, setShadeCode] = useState("")
+  const [shadeName, setRmShadeName] = useState("")
+  const [notes, setNotes] = useState("")
 
   const isValid =
     Number(ratio) > 0 &&
     ((rmType === "PRODUCT" && !!productPick) ||
-      (rmType === "ITEM" && !!itemPick) ||
       (rmType === "GROUP" && !!groupPick))
 
   return (
@@ -852,7 +917,6 @@ function AddRmDialog({
               onValueChange={(v) => {
                 setRmType(v as RmRefType)
                 setProductPick(null)
-                setItemPick(null)
                 setGroupPick(null)
               }}
             >
@@ -861,8 +925,7 @@ function AddRmDialog({
               </SelectTrigger>
               <SelectContent>
                 <SelectItem value="PRODUCT">PRODUCT — from another stage in this routing</SelectItem>
-                <SelectItem value="ITEM">ITEM — ERP raw material</SelectItem>
-                <SelectItem value="GROUP">GROUP — RM group</SelectItem>
+                <SelectItem value="GROUP">GROUP — RM group (cons/stock/PO)</SelectItem>
               </SelectContent>
             </Select>
           </div>
@@ -883,22 +946,6 @@ function AddRmDialog({
             </div>
           )}
 
-          {rmType === "ITEM" && (
-            <div>
-              <Label>ERP item</Label>
-              <ErpItemCombobox
-                value={undefined /* code-driven, not sys-id */}
-                onChange={(_id, code, name) => setItemPick({ code, name })}
-                placeholder="Search ERP item by code or name…"
-              />
-              {itemPick && (
-                <p className="mt-1 text-xs text-muted-foreground">
-                  Selected: <span className="font-mono">{itemPick.code}</span> — {itemPick.name}
-                </p>
-              )}
-            </div>
-          )}
-
           {rmType === "GROUP" && (
             <div>
               <Label>RM group</Label>
@@ -928,6 +975,23 @@ function AddRmDialog({
               />
             </div>
           </div>
+          <details className="text-xs">
+            <summary className="cursor-pointer text-muted-foreground select-none">Additional metadata (optional)</summary>
+            <div className="mt-2 grid grid-cols-2 gap-2">
+              <div>
+                <Label className="text-xs">Shade code</Label>
+                <Input value={shadeCode} onChange={(e) => setShadeCode(e.target.value)} placeholder="NL" className="h-8 text-xs" />
+              </div>
+              <div>
+                <Label className="text-xs">Shade name</Label>
+                <Input value={shadeName} onChange={(e) => setRmShadeName(e.target.value)} placeholder="NATURAL" className="h-8 text-xs" />
+              </div>
+              <div className="col-span-2">
+                <Label className="text-xs">Notes</Label>
+                <Input value={notes} onChange={(e) => setNotes(e.target.value)} placeholder="Optional notes…" className="h-8 text-xs" />
+              </div>
+            </div>
+          </details>
         </div>
         <DialogFooter>
           <Button variant="ghost" onClick={onClose}>
@@ -937,6 +1001,12 @@ function AddRmDialog({
             disabled={!isValid}
             onClick={() => {
               const ratioNum = Number(ratio) || 1
+              const rmExtra = {
+                routeRmShadeCode: shadeCode || undefined,
+                routeRmShadeName: shadeName || undefined,
+                notes: notes || undefined,
+                subType: subType || undefined,
+              }
               if (rmType === "PRODUCT" && productPick) {
                 onAdd({
                   rmId: 0,
@@ -948,21 +1018,7 @@ function AddRmDialog({
                     ? `${productPick.productCode}${productPick.productName ? " — " + productPick.productName : ""}`
                     : productPick.productName,
                   routeRmRatio: ratioNum,
-                  subType: subType || undefined,
-                })
-                return
-              }
-              if (rmType === "ITEM" && itemPick) {
-                onAdd({
-                  rmId: 0,
-                  seqId: 0,
-                  parentProductSysId: 0,
-                  rmType: "ITEM",
-                  rmItemCode: itemPick.code,
-                  routeRmName: itemPick.name,
-                  routeRmItemCode: itemPick.code,
-                  routeRmRatio: ratioNum,
-                  subType: subType || undefined,
+                  ...rmExtra,
                 })
                 return
               }
@@ -975,7 +1031,7 @@ function AddRmDialog({
                   rmGroupCode: groupPick.code,
                   routeRmName: groupPick.name,
                   routeRmRatio: ratioNum,
-                  subType: subType || undefined,
+                  ...rmExtra,
                 })
               }
             }}
diff --git a/src/components/finance/costing/params-only-import-dialog.tsx b/src/components/finance/costing/params-only-import-dialog.tsx
new file mode 100644
index 0000000..187a12c
--- /dev/null
+++ b/src/components/finance/costing/params-only-import-dialog.tsx
@@ -0,0 +1,314 @@
+"use client"
+
+import { useEffect, useRef, useState } from "react"
+import {
+  AlertCircle,
+  CheckCircle2,
+  Download,
+  FileSpreadsheet,
+  Loader2,
+  Upload,
+  XCircle,
+} from "lucide-react"
+import { useRouter } from "next/navigation"
+import { useMutation, useQuery } from "@tanstack/react-query"
+import { toast } from "sonner"
+
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog"
+import { Button } from "@/components/ui/button"
+import { Label } from "@/components/ui/label"
+import { Progress } from "@/components/ui/progress"
+import {
+  bulkImportParamsOnly,
+  downloadParamsOnlyTemplate,
+  getImportJob,
+} from "@/services/finance/cost-import-api"
+import { costImportKeys } from "@/hooks/finance/use-cost-import"
+import type { CostImportJob } from "@/types/finance/cost-import"
+
+interface Props {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+}
+
+type Step = "upload" | "submitting" | "polling" | "done" | "failed"
+
+/**
+ * ParamsOnlyImportDialog — imports product_parameters + product_applicable_params
+ * from a file that does NOT include a product_master sheet. Mirrors the
+ * ImportDialog UX: file picker, background job creation, real-time polling.
+ *
+ * File is sent as multipart/form-data (binary bytes) to avoid the ~3× JSON
+ * inflation that would occur with Array.from(Uint8Array).
+ */
+export function ParamsOnlyImportDialog({ open, onOpenChange }: Props) {
+  const fileRef = useRef<HTMLInputElement>(null)
+  const [file, setFile] = useState<File | null>(null)
+  const [step, setStep] = useState<Step>("upload")
+  const [jobId, setJobId] = useState<number | null>(null)
+  const [templateLoading, setTemplateLoading] = useState(false)
+  const router = useRouter()
+
+  useEffect(() => {
+    if (open) {
+      setFile(null)
+      setStep("upload")
+      setJobId(null)
+      if (fileRef.current) fileRef.current.value = ""
+    }
+  }, [open])
+
+  // Submit mutation
+  const submitMutation = useMutation({
+    mutationFn: (f: File) => bulkImportParamsOnly(f),
+    onSuccess: ({ jobId: id }) => {
+      setJobId(id)
+      setStep("polling")
+    },
+    onError: (e) => {
+      toast.error(`Failed to start import: ${String(e)}`)
+      setStep("upload")
+    },
+  })
+
+  // Poll job status
+  const { data: job } = useQuery<CostImportJob>({
+    queryKey: costImportKeys.job(jobId ?? 0),
+    queryFn: () => getImportJob(jobId!),
+    enabled: step === "polling" && jobId !== null,
+    refetchInterval: (query) => {
+      const status = query.state.data?.status
+      return status === "DONE" || status === "FAILED" || status === "PARTIAL" ? false : 3000
+    },
+  })
+
+  useEffect(() => {
+    if (!job) return
+    if (job.status === "DONE") {
+      setStep("done")
+      toast.success(`Params import complete: ${job.success} rows imported.`)
+    } else if (job.status === "PARTIAL") {
+      setStep("done")
+      toast.warning(`Import completed with ${job.failed} errors — check error report.`)
+    } else if (job.status === "FAILED") {
+      setStep("failed")
+    }
+  }, [job?.status]) // eslint-disable-line react-hooks/exhaustive-deps
+
+  async function handleDownloadTemplate() {
+    setTemplateLoading(true)
+    try {
+      await downloadParamsOnlyTemplate()
+    } catch (e) {
+      toast.error(`Template download failed: ${String(e)}`)
+    } finally {
+      setTemplateLoading(false)
+    }
+  }
+
+  function handleClose() {
+    setFile(null)
+    setStep("upload")
+    setJobId(null)
+    submitMutation.reset()
+    if (fileRef.current) fileRef.current.value = ""
+    onOpenChange(false)
+  }
+
+  const isPolling = step === "polling"
+  const isDone = step === "done"
+  const isFailed = step === "failed"
+  const isSubmitting = submitMutation.isPending
+
+  const progressPercent =
+    job && job.totalRows > 0 ? Math.round((job.processed / job.totalRows) * 100) : 0
+
+  return (
+    <Dialog open={open} onOpenChange={handleClose}>
+      <DialogContent className="sm:max-w-[550px]">
+        <DialogHeader>
+          <DialogTitle>Import Params Only (Bulk)</DialogTitle>
+        </DialogHeader>
+
+        <div className="space-y-4 py-2">
+          {/* Template card */}
+          {!isPolling && !isDone && !isFailed && (
+            <div className="flex items-center justify-between rounded-lg border p-4">
+              <div className="flex items-center gap-3">
+                <FileSpreadsheet className="h-8 w-8 text-green-600" />
+                <div>
+                  <p className="font-medium">Params-Only Template</p>
+                  <p className="text-sm text-muted-foreground">
+                    2 sheets: product_parameters + product_applicable_params
+                  </p>
+                </div>
+              </div>
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => void handleDownloadTemplate()}
+                disabled={templateLoading || isSubmitting}
+              >
+                {templateLoading ? (
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                ) : (
+                  <Download className="mr-2 h-4 w-4" />
+                )}
+                Download
+              </Button>
+            </div>
+          )}
+
+          {/* File picker */}
+          {!isPolling && !isDone && !isFailed && (
+            <div className="space-y-2">
+              <Label>Select File</Label>
+              <div
+                className="flex cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-dashed p-6 transition-colors hover:border-primary/50"
+                onClick={() => fileRef.current?.click()}
+              >
+                <input
+                  ref={fileRef}
+                  type="file"
+                  accept=".xlsx,.xls"
+                  className="hidden"
+                  onChange={(e) => setFile(e.target.files?.[0] ?? null)}
+                />
+                {file ? (
+                  <div className="flex items-center gap-2">
+                    <FileSpreadsheet className="h-6 w-6 text-green-600" />
+                    <span className="font-medium">{file.name}</span>
+                    <span className="text-sm text-muted-foreground">
+                      ({(file.size / 1024 / 1024).toFixed(1)} MB)
+                    </span>
+                  </div>
+                ) : (
+                  <>
+                    <Upload className="mb-2 h-8 w-8 text-muted-foreground" />
+                    <p className="text-sm text-muted-foreground">
+                      Click to select or drag and drop an Excel file
+                    </p>
+                    <p className="text-xs text-muted-foreground">
+                      Supports split part-sheets (_p1, _p2, …) · Sent as binary (large files OK)
+                    </p>
+                  </>
+                )}
+              </div>
+            </div>
+          )}
+
+          {/* Warning */}
+          {!isPolling && !isDone && !isFailed && (
+            <div className="flex gap-2 rounded-lg border border-amber-200 bg-amber-50 p-3 text-sm text-amber-800 dark:border-amber-800 dark:bg-amber-950 dark:text-amber-200">
+              <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
+              <span>
+                All-or-nothing validation. If any <code className="font-mono text-xs">param_code</code> is
+                unknown, the entire job fails and an error report (with{" "}
+                <strong>missing_param_codes</strong> tab) is generated. Products must already
+                exist from a prior bulk import.
+              </span>
+            </div>
+          )}
+
+          {/* Polling progress */}
+          {isPolling && job && (
+            <div className="space-y-3">
+              <div className="flex items-center justify-between text-sm">
+                <span className="text-muted-foreground">Processing params…</span>
+                <span className="font-medium">
+                  {job.processed.toLocaleString()} / {job.totalRows.toLocaleString()} rows
+                </span>
+              </div>
+              {job.totalRows > 0 && (
+                <Progress value={progressPercent} className="h-2" />
+              )}
+              <p className="text-xs text-muted-foreground text-center">
+                Running in background — you can close this dialog.
+              </p>
+            </div>
+          )}
+
+          {isPolling && !job && (
+            <div className="flex items-center justify-center gap-2 py-4 text-sm text-muted-foreground">
+              <Loader2 className="h-4 w-4 animate-spin" />
+              Queuing import job…
+            </div>
+          )}
+
+          {/* Done state */}
+          {isDone && job && (
+            <div className="flex items-center gap-3 rounded-lg border border-green-200 bg-green-50 p-4 dark:border-green-800 dark:bg-green-950">
+              <CheckCircle2 className="h-5 w-5 shrink-0 text-green-600" />
+              <div>
+                <p className="font-medium text-green-800 dark:text-green-200">
+                  {job.status === "DONE"
+                    ? `Import complete — ${job.success.toLocaleString()} rows imported`
+                    : `Partial import — ${job.failed.toLocaleString()} errors`}
+                </p>
+                {job.errorFileUrl && (
+                  <p className="text-sm text-green-700 dark:text-green-300">
+                    Error report available in Import Jobs.
+                  </p>
+                )}
+                <Button
+                  variant="link"
+                  size="sm"
+                  className="mt-1 h-auto p-0 text-green-700"
+                  onClick={() => router.push("/finance/import-jobs")}
+                >
+                  View Import Jobs →
+                </Button>
+              </div>
+            </div>
+          )}
+
+          {/* Failed state */}
+          {isFailed && job && (
+            <div className="flex items-center gap-3 rounded-lg border border-red-200 bg-red-50 p-4 dark:border-red-800 dark:bg-red-950">
+              <XCircle className="h-5 w-5 shrink-0 text-red-600" />
+              <div>
+                <p className="font-medium text-red-800 dark:text-red-200">Import failed</p>
+                <p className="text-sm text-red-700 dark:text-red-300">
+                  {"See error report in Import Jobs for details."}
+                </p>
+                <Button
+                  variant="link"
+                  size="sm"
+                  className="mt-1 h-auto p-0 text-red-700"
+                  onClick={() => router.push("/finance/import-jobs")}
+                >
+                  View Error Report →
+                </Button>
+              </div>
+            </div>
+          )}
+        </div>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={handleClose}>
+            {isDone || isFailed ? "Close" : "Cancel"}
+          </Button>
+          {!isPolling && !isDone && !isFailed && (
+            <Button
+              onClick={() => { if (file) submitMutation.mutate(file) }}
+              disabled={!file || isSubmitting}
+            >
+              {isSubmitting ? (
+                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              ) : (
+                <Upload className="mr-2 h-4 w-4" />
+              )}
+              Import
+            </Button>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/components/finance/formula/formula-form-dialog.tsx b/src/components/finance/formula/formula-form-dialog.tsx
index 952f206..62026cf 100644
--- a/src/components/finance/formula/formula-form-dialog.tsx
+++ b/src/components/finance/formula/formula-form-dialog.tsx
@@ -63,6 +63,14 @@ const validTypeValues = [
   FormulaType.FORMULA_TYPE_CALCULATION,
   FormulaType.FORMULA_TYPE_SQL_QUERY,
   FormulaType.FORMULA_TYPE_CONSTANT,
+  FormulaType.FORMULA_TYPE_CONDITIONAL,
+  FormulaType.FORMULA_TYPE_LOOKUP,
+  FormulaType.FORMULA_TYPE_RM_LOOKUP,
+  FormulaType.FORMULA_TYPE_FROM_MARKETING,
+  FormulaType.FORMULA_TYPE_INTERMINGLING,
+  FormulaType.FORMULA_TYPE_SNAPSHOT,
+  FormulaType.FORMULA_TYPE_PENDING,
+  FormulaType.FORMULA_TYPE_INITIAL_VALUE,
 ]
 
 const formulaFormSchema = z.object({
@@ -105,6 +113,17 @@ const formulaFormSchema = z.object({
       path: ["inputParamIds"],
     })
   }
+  // Prevent self-reference: input param cannot be the same as result param
+  if (
+    data.resultParamId &&
+    data.inputParamIds.includes(data.resultParamId)
+  ) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: "Input parameters cannot include the result parameter (circular reference)",
+      path: ["inputParamIds"],
+    })
+  }
 })
 
 interface FormulaFormDialogProps {
@@ -131,7 +150,7 @@ export function FormulaFormDialog({
   )
   const fullFormula = fullFormulaResult?.data ?? null
 
-  // Fetch CALCULATED params for result parameter dropdown
+  // Fetch CALCULATED params — these are always valid result params
   const { data: calculatedParamData } = useParameters({
     page: 1,
     pageSize: 200,
@@ -160,6 +179,14 @@ export function FormulaFormDialog({
     sortOrder: "asc",
   })
 
+  // Result param pool = CALCULATED + INPUT. INPUT params can also be formula outputs
+  // (e.g. AX_WT is INPUT category but is the result of F_YARN_AX_WT_FROM_MKT).
+  // This matches Oracle's design where FROM_MARKETING formulas write to INPUT params.
+  const resultParamPool = useMemo(() => [
+    ...(calculatedParamData?.data || []),
+    ...(inputParamData?.data || []),
+  ].sort((a, b) => (a.paramCode || "").localeCompare(b.paramCode || "")), [calculatedParamData, inputParamData])
+
   const calculatedParams = useMemo(() => calculatedParamData?.data || [], [calculatedParamData])
   // Input picker = INPUT + RATE + CALCULATED. A CALCULATED param IS a valid
   // input to a *downstream* formula (formula chaining) — this is what enables
@@ -185,6 +212,10 @@ export function FormulaFormDialog({
     },
   })
 
+  // Watch formulaType to conditionally show input params section.
+  const watchedFormulaType = form.watch("formulaType")
+  const showInputParams = watchedFormulaType === FormulaType.FORMULA_TYPE_CALCULATION
+
   // Watch resultParamId to exclude it from the input picker (no self-loop).
   const watchedResultParamId = form.watch("resultParamId")
   const filteredInputParams = useMemo(() => {
@@ -392,13 +423,13 @@ export function FormulaFormDialog({
                 )}
               />
 
-              {/* Result Parameter - Only CALCULATED params */}
+              {/* Result Parameter — CALCULATED + INPUT params (INPUT params can also be formula outputs) */}
               <FormField
                 control={form.control}
                 name="resultParamId"
                 render={({ field }) => (
                   <FormItem>
-                    <FormLabel>Result Parameter</FormLabel>
+                    <FormLabel>Result Parameter <span className="text-destructive">*</span></FormLabel>
                     <Select
                       onValueChange={field.onChange}
                       value={field.value || ""}
@@ -410,95 +441,98 @@ export function FormulaFormDialog({
                         </SelectTrigger>
                       </FormControl>
                       <SelectContent>
-                        {calculatedParams.map((param) => (
+                        {resultParamPool.map((param) => (
                           <SelectItem key={param.paramId} value={param.paramId}>
                             <span className="font-mono text-xs">{param.paramCode}</span>
+                            <span className="ml-1 text-xs text-muted-foreground">({String(param.paramCategory ?? "").replace("PARAM_CATEGORY_", "").toLowerCase()})</span>
                             <span className="ml-2 text-muted-foreground">— {param.paramName}</span>
                           </SelectItem>
                         ))}
                       </SelectContent>
                     </Select>
                     <FormDescription>
-                      Only &quot;Calculated&quot; type parameters are shown
+                      Calculated and Input category parameters can be formula outputs.
                     </FormDescription>
                     <FormMessage />
                   </FormItem>
                 )}
               />
 
-              {/* Input Parameters - Only INPUT + RATE params */}
-              <FormField
-                control={form.control}
-                name="inputParamIds"
-                render={() => (
-                  <FormItem>
-                    <FormLabel>Input Parameters</FormLabel>
-                    {selectedInputIds.length > 0 && (
-                      <div className="flex flex-wrap gap-1 pb-2">
-                        {selectedInputIds.map((id) => {
-                          const p = inputPool.find((param) => param.paramId === id)
-                          return (
-                            <Badge key={id} variant="secondary" className="text-xs">
-                              {p?.paramCode || id}
-                              <button
-                                type="button"
-                                onClick={() => toggleInputParam(id)}
-                                className="ml-1 hover:text-destructive"
-                                disabled={isPending}
-                              >
-                                <X className="h-3 w-3" />
-                              </button>
-                            </Badge>
-                          )
-                        })}
-                      </div>
-                    )}
-                    <div className="rounded-md border">
-                      <div className="flex items-center border-b px-3">
-                        <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
-                        <Input
-                          placeholder="Search parameters..."
-                          value={inputParamSearch}
-                          onChange={(e) => setInputParamSearch(e.target.value)}
-                          className="border-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-                          disabled={isPending}
-                        />
-                      </div>
-                      <ScrollArea className="h-[150px]">
-                        <div className="p-2 space-y-1">
-                          {filteredInputParams.length === 0 ? (
-                            <p className="text-sm text-muted-foreground text-center py-4">
-                              No parameters found
-                            </p>
-                          ) : (
-                            filteredInputParams.map((param) => (
-                              <label
-                                key={param.paramId}
-                                className="flex items-center space-x-2 rounded-md px-2 py-1.5 hover:bg-accent cursor-pointer"
-                              >
-                                <Checkbox
-                                  checked={selectedInputIds.includes(param.paramId)}
-                                  onCheckedChange={() => toggleInputParam(param.paramId)}
+              {/* Input Parameters - only shown for CALCULATION type */}
+              {showInputParams && (
+                <FormField
+                  control={form.control}
+                  name="inputParamIds"
+                  render={() => (
+                    <FormItem>
+                      <FormLabel>Input Parameters</FormLabel>
+                      {selectedInputIds.length > 0 && (
+                        <div className="flex flex-wrap gap-1 pb-2">
+                          {selectedInputIds.map((id) => {
+                            const p = inputPool.find((param) => param.paramId === id)
+                            return (
+                              <Badge key={id} variant="secondary" className="text-xs">
+                                {p?.paramCode || id}
+                                <button
+                                  type="button"
+                                  onClick={() => toggleInputParam(id)}
+                                  className="ml-1 hover:text-destructive"
                                   disabled={isPending}
-                                />
-                                <span className="font-mono text-xs">{param.paramCode}</span>
-                                <span className="text-xs text-muted-foreground truncate">
-                                  — {param.paramName}
-                                </span>
-                              </label>
-                            ))
-                          )}
+                                >
+                                  <X className="h-3 w-3" />
+                                </button>
+                              </Badge>
+                            )
+                          })}
                         </div>
-                      </ScrollArea>
-                    </div>
-                    <FormDescription>
-                      Input, Rate, and Calculated parameters are all available — pick the ones referenced in the expression above.
-                      Calculated params enable formula chaining (e.g. COST_CONVERSION uses COST_LABOR_FULL which is itself produced by another formula).
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+                      )}
+                      <div className="rounded-md border">
+                        <div className="flex items-center border-b px-3">
+                          <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
+                          <Input
+                            placeholder="Search parameters..."
+                            value={inputParamSearch}
+                            onChange={(e) => setInputParamSearch(e.target.value)}
+                            className="border-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+                            disabled={isPending}
+                          />
+                        </div>
+                        <ScrollArea className="h-[150px]">
+                          <div className="p-2 space-y-1">
+                            {filteredInputParams.length === 0 ? (
+                              <p className="text-sm text-muted-foreground text-center py-4">
+                                No parameters found
+                              </p>
+                            ) : (
+                              filteredInputParams.map((param) => (
+                                <label
+                                  key={param.paramId}
+                                  className="flex items-center space-x-2 rounded-md px-2 py-1.5 hover:bg-accent cursor-pointer"
+                                >
+                                  <Checkbox
+                                    checked={selectedInputIds.includes(param.paramId)}
+                                    onCheckedChange={() => toggleInputParam(param.paramId)}
+                                    disabled={isPending}
+                                  />
+                                  <span className="font-mono text-xs">{param.paramCode}</span>
+                                  <span className="text-xs text-muted-foreground truncate">
+                                    — {param.paramName}
+                                  </span>
+                                </label>
+                              ))
+                            )}
+                          </div>
+                        </ScrollArea>
+                      </div>
+                      <FormDescription>
+                        Input, Rate, and Calculated parameters are all available — pick the ones referenced in the expression above.
+                        Calculated params enable formula chaining (e.g. COST_CONVERSION uses COST_LABOR_FULL which is itself produced by another formula).
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              )}
 
               <FormField
                 control={form.control}
diff --git a/src/components/finance/machine/machine-form-dialog.tsx b/src/components/finance/machine/machine-form-dialog.tsx
index 4c25d70..420e776 100644
--- a/src/components/finance/machine/machine-form-dialog.tsx
+++ b/src/components/finance/machine/machine-form-dialog.tsx
@@ -45,6 +45,21 @@ const formSchema = z.object({
   mcEfficiency: z.coerce.number().min(0).max(100).default(95),
   machineRpm: z.coerce.number().min(0).optional().nullable(),
   powerPerDay: z.coerce.number().min(0).optional().nullable(),
+  mpPerDay: z.coerce.number().min(0).optional().nullable(),
+  ohsPerDay: z.coerce.number().min(0).optional().nullable(),
+  sparesPerDay: z.coerce.number().min(0).optional().nullable(),
+  kgsLostChange: z.coerce.number().min(0).optional().nullable(),
+  mcPoyBobbinWeight: z.coerce.number().min(0).optional().nullable(),
+  mcTotFxdCst: z.coerce.number().min(0).optional().nullable(),
+  mcBobbinPerTrolly: z.coerce.number().min(0).optional().nullable(),
+  mcBoxCost: z.coerce.number().min(0).optional().nullable(),
+  mcCaptivePerBobbin: z.coerce.number().min(0).optional().nullable(),
+  mcWeightage: z.coerce.number().min(0).optional().nullable(),
+  vb1Qty: z.coerce.number().min(0).optional().nullable(),
+  vb2Qty: z.coerce.number().min(0).optional().nullable(),
+  vb3Qty: z.coerce.number().min(0).optional().nullable(),
+  vb4Qty: z.coerce.number().min(0).optional().nullable(),
+  vb5Qty: z.coerce.number().min(0).optional().nullable(),
   notes: z.string().max(500).optional(),
   isActive: z.boolean(),
 })
@@ -68,7 +83,14 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
     defaultValues: {
       machineCode: "", machineName: "", mcType: "", mcLocation: "",
       noOfPosition: 0, noOfEnd: 1, mcSpeed: 0, mcEfficiency: 95,
-      machineRpm: null, powerPerDay: null, notes: "", isActive: true,
+      machineRpm: null, powerPerDay: null,
+      mpPerDay: null, ohsPerDay: null, sparesPerDay: null,
+      kgsLostChange: null,
+      mcPoyBobbinWeight: null, mcTotFxdCst: null, mcBobbinPerTrolly: null,
+      mcBoxCost: null, mcCaptivePerBobbin: null, mcWeightage: null,
+      vb1Qty: null, vb2Qty: null,
+      vb3Qty: null, vb4Qty: null, vb5Qty: null,
+      notes: "", isActive: true,
     },
   })
 
@@ -87,13 +109,35 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
               mcEfficiency: machine.mcEfficiency ?? 95,
               machineRpm: machine.machineRpm ?? null,
               powerPerDay: machine.powerPerDay ?? null,
+              mpPerDay: machine.mpPerDay ?? null,
+              ohsPerDay: machine.ohsPerDay ?? null,
+              sparesPerDay: machine.sparesPerDay ?? null,
+              kgsLostChange: machine.kgsLostChange ?? null,
+              mcPoyBobbinWeight: machine.mcPoyBobbinWeight ?? null,
+              mcTotFxdCst: machine.mcTotFxdCst ?? null,
+              mcBobbinPerTrolly: machine.mcBobbinPerTrolly ?? null,
+              mcBoxCost: machine.mcBoxCost ?? null,
+              mcCaptivePerBobbin: machine.mcCaptivePerBobbin ?? null,
+              mcWeightage: machine.mcWeightage ?? null,
+              vb1Qty: machine.vb1Qty ?? null,
+              vb2Qty: machine.vb2Qty ?? null,
+              vb3Qty: machine.vb3Qty ?? null,
+              vb4Qty: machine.vb4Qty ?? null,
+              vb5Qty: machine.vb5Qty ?? null,
               notes: machine.notes || "",
               isActive: machine.isActive ?? true,
             }
           : {
               machineCode: "", machineName: "", mcType: "", mcLocation: "",
               noOfPosition: 0, noOfEnd: 1, mcSpeed: 0, mcEfficiency: 95,
-              machineRpm: null, powerPerDay: null, notes: "", isActive: true,
+              machineRpm: null, powerPerDay: null,
+              mpPerDay: null, ohsPerDay: null, sparesPerDay: null,
+              kgsLostChange: null,
+              mcPoyBobbinWeight: null, mcTotFxdCst: null, mcBobbinPerTrolly: null,
+              mcBoxCost: null, mcCaptivePerBobbin: null, mcWeightage: null,
+              vb1Qty: null, vb2Qty: null,
+              vb3Qty: null, vb4Qty: null, vb5Qty: null,
+              notes: "", isActive: true,
             }
       )
     }
@@ -115,6 +159,21 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
             mcEfficiency: values.mcEfficiency,
             machineRpm: values.machineRpm ?? undefined,
             powerPerDay: values.powerPerDay ?? undefined,
+            mpPerDay: values.mpPerDay ?? undefined,
+            ohsPerDay: values.ohsPerDay ?? undefined,
+            sparesPerDay: values.sparesPerDay ?? undefined,
+            kgsLostChange: values.kgsLostChange ?? undefined,
+            mcPoyBobbinWeight: values.mcPoyBobbinWeight ?? undefined,
+            mcTotFxdCst: values.mcTotFxdCst ?? undefined,
+            mcBobbinPerTrolly: values.mcBobbinPerTrolly ?? undefined,
+            mcBoxCost: values.mcBoxCost ?? undefined,
+            mcCaptivePerBobbin: values.mcCaptivePerBobbin ?? undefined,
+            mcWeightage: values.mcWeightage ?? undefined,
+            vb1Qty: values.vb1Qty ?? undefined,
+            vb2Qty: values.vb2Qty ?? undefined,
+            vb3Qty: values.vb3Qty ?? undefined,
+            vb4Qty: values.vb4Qty ?? undefined,
+            vb5Qty: values.vb5Qty ?? undefined,
             notes: values.notes,
             isActive: values.isActive,
           },
@@ -131,6 +190,21 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
           mcEfficiency: values.mcEfficiency,
           machineRpm: values.machineRpm ?? undefined,
           powerPerDay: values.powerPerDay ?? undefined,
+          mpPerDay: values.mpPerDay ?? undefined,
+          ohsPerDay: values.ohsPerDay ?? undefined,
+          sparesPerDay: values.sparesPerDay ?? undefined,
+          kgsLostChange: values.kgsLostChange ?? undefined,
+          mcPoyBobbinWeight: values.mcPoyBobbinWeight ?? undefined,
+          mcTotFxdCst: values.mcTotFxdCst ?? undefined,
+          mcBobbinPerTrolly: values.mcBobbinPerTrolly ?? undefined,
+          mcBoxCost: values.mcBoxCost ?? undefined,
+          mcCaptivePerBobbin: values.mcCaptivePerBobbin ?? undefined,
+          mcWeightage: values.mcWeightage ?? undefined,
+          vb1Qty: values.vb1Qty ?? undefined,
+          vb2Qty: values.vb2Qty ?? undefined,
+          vb3Qty: values.vb3Qty ?? undefined,
+          vb4Qty: values.vb4Qty ?? undefined,
+          vb5Qty: values.vb5Qty ?? undefined,
           notes: values.notes || "",
         })
       }
@@ -145,7 +219,7 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-[560px]">
+      <DialogContent className="sm:max-w-[640px] max-h-[90vh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>{isEditing ? "Edit Machine" : "Add Machine"}</DialogTitle>
           <DialogDescription>
@@ -308,6 +382,130 @@ export function MachineFormDialog({ open, onOpenChange, machine, onSuccess }: Ma
               />
             </div>
 
+            {/* Costs & Volume Buckets */}
+            <div className="border-t pt-4 mt-2">
+              <p className="text-sm font-medium text-muted-foreground mb-3">Costs &amp; Volume Buckets (auto-fill source)</p>
+              <div className="grid grid-cols-2 gap-4">
+                <FormField control={form.control} name="mpPerDay" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Manpower / Day (USD)</FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.0001" value={field.value ?? ""} placeholder="e.g. 85.00" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="ohsPerDay" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Overhead / Head / Day (USD)</FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.0001" value={field.value ?? ""} placeholder="e.g. 12.50" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="sparesPerDay" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Spares / Day (USD)</FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.0001" value={field.value ?? ""} placeholder="e.g. 5.00" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="kgsLostChange" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Change-Over Loss (kg)</FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.001" value={field.value ?? ""} placeholder="e.g. 2.5" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+              </div>
+              <p className="text-sm font-medium text-muted-foreground mt-3 mb-2">Volume Bucket Qty Thresholds (kg)</p>
+              <div className="grid grid-cols-5 gap-2">
+                {(["vb1Qty", "vb2Qty", "vb3Qty", "vb4Qty", "vb5Qty"] as const).map((name, i) => (
+                  <FormField key={name} control={form.control} name={name} render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>VB{i + 1}</FormLabel>
+                      <FormControl>
+                        <Input {...field} type="number" step="1" value={field.value ?? ""} placeholder="0" disabled={isPending} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )} />
+                ))}
+              </div>
+            </div>
+
+            {/* Oracle Machine Data */}
+            <div className="border-t pt-4 mt-2">
+              <p className="text-sm font-medium text-muted-foreground mb-3">Oracle Machine Data</p>
+              <div className="grid grid-cols-2 gap-4">
+                <FormField control={form.control} name="mcPoyBobbinWeight" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>POY Bobbin Weight (kg) <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="mcTotFxdCst" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Total Fixed Cost <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="mcBobbinPerTrolly" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Bobbin Per Trolley <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="mcBoxCost" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Box Cost <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="mcCaptivePerBobbin" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Captive Per Bobbin <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+                <FormField control={form.control} name="mcWeightage" render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Weightage <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )} />
+              </div>
+            </div>
+
             <FormField
               control={form.control}
               name="notes"
diff --git a/src/components/finance/machine/machine-table.tsx b/src/components/finance/machine/machine-table.tsx
index 0489077..2f1ea94 100644
--- a/src/components/finance/machine/machine-table.tsx
+++ b/src/components/finance/machine/machine-table.tsx
@@ -35,6 +35,68 @@ export function MachineTable({ data, isLoading, onEdit, onDelete }: MachineTable
       width: "w-[100px]",
       cell: (row) => row.mcType || "-",
     },
+    {
+      id: "noOfPosition",
+      header: "Positions",
+      width: "w-[90px]",
+      hideOnMobile: true,
+      cell: (row) => row.noOfPosition ?? <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "noOfEnd",
+      header: "Ends",
+      width: "w-[70px]",
+      hideOnMobile: true,
+      cell: (row) => row.noOfEnd ?? <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mpPerDay",
+      header: "MP/Day",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) =>
+        row.mpPerDay != null
+          ? `$${row.mpPerDay.toFixed(2)}`
+          : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "ohsPerDay",
+      header: "OHS/Day",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.ohsPerDay != null ? `$${row.ohsPerDay.toFixed(2)}` : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "sparesPerDay",
+      header: "Spares/Day",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.sparesPerDay != null ? `$${row.sparesPerDay.toFixed(2)}` : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mcWeightage",
+      header: "Weightage",
+      width: "w-[90px]",
+      hideOnMobile: true,
+      cell: (row) => row.mcWeightage != null ? row.mcWeightage.toFixed(2) : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mcPoyBobbinWeight",
+      header: "Bobbin Wt (kg)",
+      width: "w-[110px]",
+      hideOnMobile: true,
+      cell: (row) => row.mcPoyBobbinWeight != null ? row.mcPoyBobbinWeight.toFixed(2) : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "kgsLostChange",
+      header: "CO Loss (kg)",
+      width: "w-[110px]",
+      hideOnMobile: true,
+      cell: (row) =>
+        row.kgsLostChange != null
+          ? row.kgsLostChange.toFixed(3)
+          : <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "notes",
       header: "Notes",
diff --git a/src/components/finance/mb-head/mb-head-form-dialog.tsx b/src/components/finance/mb-head/mb-head-form-dialog.tsx
index 3ba2042..4470bcf 100644
--- a/src/components/finance/mb-head/mb-head-form-dialog.tsx
+++ b/src/components/finance/mb-head/mb-head-form-dialog.tsx
@@ -37,6 +37,11 @@ const formSchema = z.object({
   mbhDenier: z.coerce.number().positive().optional().or(z.literal("")),
   mbhFilament: z.coerce.number().int().positive().optional().or(z.literal("")),
   mbhDozing: z.coerce.number().min(0).max(100).optional().or(z.literal("")),
+  mbhCheckStatus: z.string().max(50).optional(),
+  mbhStatus: z.string().max(100).optional(),
+  mbhLdrPrsn: z.coerce.number().min(0).optional().nullable(),
+  mbhFinalProduct: z.string().max(200).optional(),
+  mbhCode: z.string().max(100).optional(),
   mbhIsActive: z.boolean(),
 })
 
@@ -58,7 +63,9 @@ export function MBHeadFormDialog({ open, onOpenChange, mbHead, onSuccess }: MBHe
     resolver: zodResolver(formSchema) as never,
     defaultValues: {
       mbhMbCosting: "", mbhOracleSysId: "", mbhMgtName: "",
-      mbhDenier: "", mbhFilament: "", mbhDozing: "", mbhIsActive: true,
+      mbhDenier: "", mbhFilament: "", mbhDozing: "",
+      mbhCheckStatus: "", mbhStatus: "", mbhLdrPrsn: null, mbhFinalProduct: "", mbhCode: "",
+      mbhIsActive: true,
     },
   })
 
@@ -73,9 +80,14 @@ export function MBHeadFormDialog({ open, onOpenChange, mbHead, onSuccess }: MBHe
               mbhDenier: mbHead.mbhDenier ?? "",
               mbhFilament: mbHead.mbhFilament ?? "",
               mbhDozing: mbHead.mbhDozing ?? "",
+              mbhCheckStatus: mbHead.mbhCheckStatus || "",
+              mbhStatus: mbHead.mbhStatus || "",
+              mbhLdrPrsn: mbHead.mbhLdrPrsn ?? null,
+              mbhFinalProduct: mbHead.mbhFinalProduct || "",
+              mbhCode: mbHead.mbhCode || "",
               mbhIsActive: mbHead.mbhIsActive ?? true,
             }
-          : { mbhMbCosting: "", mbhOracleSysId: "", mbhMgtName: "", mbhDenier: "", mbhFilament: "", mbhDozing: "", mbhIsActive: true }
+          : { mbhMbCosting: "", mbhOracleSysId: "", mbhMgtName: "", mbhDenier: "", mbhFilament: "", mbhDozing: "", mbhCheckStatus: "", mbhStatus: "", mbhLdrPrsn: null, mbhFinalProduct: "", mbhCode: "", mbhIsActive: true }
       )
     }
   }, [open, mbHead, form])
@@ -93,6 +105,11 @@ export function MBHeadFormDialog({ open, onOpenChange, mbHead, onSuccess }: MBHe
             mbhDenier: toOptNum(values.mbhDenier),
             mbhFilament: toOptNum(values.mbhFilament),
             mbhDozing: toOptNum(values.mbhDozing),
+            mbhCheckStatus: values.mbhCheckStatus || undefined,
+            mbhStatus: values.mbhStatus || undefined,
+            mbhLdrPrsn: values.mbhLdrPrsn ?? undefined,
+            mbhFinalProduct: values.mbhFinalProduct || undefined,
+            mbhCode: values.mbhCode || undefined,
             mbhIsActive: values.mbhIsActive,
           },
         })
@@ -104,6 +121,11 @@ export function MBHeadFormDialog({ open, onOpenChange, mbHead, onSuccess }: MBHe
           mbhDenier: toOptNum(values.mbhDenier),
           mbhFilament: toOptNum(values.mbhFilament),
           mbhDozing: toOptNum(values.mbhDozing),
+          mbhCheckStatus: values.mbhCheckStatus || undefined,
+          mbhStatus: values.mbhStatus || undefined,
+          mbhLdrPrsn: values.mbhLdrPrsn ?? undefined,
+          mbhFinalProduct: values.mbhFinalProduct || undefined,
+          mbhCode: values.mbhCode || undefined,
         })
       }
       onOpenChange(false)
@@ -211,6 +233,79 @@ export function MBHeadFormDialog({ open, onOpenChange, mbHead, onSuccess }: MBHe
               )}
             />
 
+            {/* Oracle Data */}
+            <div className="border-t pt-4 mt-2">
+              <p className="text-sm font-medium text-muted-foreground mb-3">Oracle Data</p>
+              <div className="grid grid-cols-2 gap-4">
+                <FormField
+                  control={form.control}
+                  name="mbhCode"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Code <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="Optional" disabled={isPending} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="mbhStatus"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Status <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="Optional" disabled={isPending} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="mbhCheckStatus"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Check Status <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="Optional" disabled={isPending} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="mbhLdrPrsn"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>LDR Prsn <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="mbhFinalProduct"
+                  render={({ field }) => (
+                    <FormItem className="col-span-2">
+                      <FormLabel>Final Product <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder="Optional" disabled={isPending} />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+            </div>
+
             {isEditing && (
               <FormField
                 control={form.control}
diff --git a/src/components/finance/mb-head/mb-head-table.tsx b/src/components/finance/mb-head/mb-head-table.tsx
index fa46b4f..21761d6 100644
--- a/src/components/finance/mb-head/mb-head-table.tsx
+++ b/src/components/finance/mb-head/mb-head-table.tsx
@@ -27,6 +27,20 @@ export function MBHeadTable({ data, isLoading, onEdit, onDelete }: MBHeadTablePr
       header: "Mgt Name",
       cell: (row) => row.mbhMgtName || "-",
     },
+    {
+      id: "mbhStatus",
+      header: "Status",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbhStatus || <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mbhCheckStatus",
+      header: "Check Status",
+      width: "w-[110px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbhCheckStatus || <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "mbhDenier",
       header: "Denier",
@@ -41,6 +55,13 @@ export function MBHeadTable({ data, isLoading, onEdit, onDelete }: MBHeadTablePr
       hideOnMobile: true,
       cell: (row) => row.mbhFilament ?? "-",
     },
+    {
+      id: "mbhDozing",
+      header: "Dozing (%)",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbhDozing != null ? `${row.mbhDozing.toFixed(2)}%` : <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "mbhIsActive",
       header: "Status",
diff --git a/src/components/finance/mb-spin/mb-spin-form-dialog.tsx b/src/components/finance/mb-spin/mb-spin-form-dialog.tsx
index 58f8717..dc31bfb 100644
--- a/src/components/finance/mb-spin/mb-spin-form-dialog.tsx
+++ b/src/components/finance/mb-spin/mb-spin-form-dialog.tsx
@@ -47,6 +47,11 @@ const formSchema = z.object({
   mbsFilament: z.coerce.number().int().positive().optional().or(z.literal("")),
   mbsDozing: z.coerce.number().min(0).max(100).optional().or(z.literal("")),
   mbsMbCosting: z.string().max(50).optional(),
+  mbsCc: z.string().max(100).optional(),
+  mbsCostRateMkt: z.coerce.number().min(0).optional().nullable(),
+  mbsStatus: z.string().max(100).optional(),
+  mbsLdrPrsn: z.coerce.number().min(0).optional().nullable(),
+  mbsFinalProduct: z.string().max(200).optional(),
   mbsIsActive: z.boolean(),
 })
 
@@ -75,7 +80,8 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
     resolver: zodResolver(formSchema) as never,
     defaultValues: {
       mbhId: headId || "", mbsMgtName: "", mbsOracleSysId: "",
-      mbsDenier: "", mbsFilament: "", mbsDozing: "", mbsMbCosting: "", mbsIsActive: true,
+      mbsDenier: "", mbsFilament: "", mbsDozing: "", mbsMbCosting: "", mbsCc: "", mbsCostRateMkt: null,
+      mbsStatus: "", mbsLdrPrsn: null, mbsFinalProduct: "", mbsIsActive: true,
     },
   })
 
@@ -91,9 +97,14 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
               mbsFilament: mbSpin.mbsFilament ?? "",
               mbsDozing: mbSpin.mbsDozing ?? "",
               mbsMbCosting: mbSpin.mbsMbCosting || "",
+              mbsCc: mbSpin.mbsCc ?? "",
+              mbsCostRateMkt: mbSpin.mbsCostRateMkt ?? null,
+              mbsStatus: mbSpin.mbsStatus || "",
+              mbsLdrPrsn: mbSpin.mbsLdrPrsn ?? null,
+              mbsFinalProduct: mbSpin.mbsFinalProduct || "",
               mbsIsActive: mbSpin.mbsIsActive ?? true,
             }
-          : { mbhId: headId || "", mbsMgtName: "", mbsOracleSysId: "", mbsDenier: "", mbsFilament: "", mbsDozing: "", mbsMbCosting: "", mbsIsActive: true }
+          : { mbhId: headId || "", mbsMgtName: "", mbsOracleSysId: "", mbsDenier: "", mbsFilament: "", mbsDozing: "", mbsMbCosting: "", mbsCc: "", mbsCostRateMkt: null, mbsStatus: "", mbsLdrPrsn: null, mbsFinalProduct: "", mbsIsActive: true }
       )
     }
   }, [open, mbSpin, headId, form])
@@ -112,6 +123,11 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
             mbsFilament: toOptNum(values.mbsFilament),
             mbsDozing: toOptNum(values.mbsDozing),
             mbsMbCosting: values.mbsMbCosting || undefined,
+            mbsCc: values.mbsCc || undefined,
+            mbsCostRateMkt: values.mbsCostRateMkt ?? undefined,
+            mbsStatus: values.mbsStatus || undefined,
+            mbsLdrPrsn: values.mbsLdrPrsn ?? undefined,
+            mbsFinalProduct: values.mbsFinalProduct || undefined,
             mbsIsActive: values.mbsIsActive,
           },
         })
@@ -124,6 +140,11 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
           mbsFilament: toOptNum(values.mbsFilament),
           mbsDozing: toOptNum(values.mbsDozing),
           mbsMbCosting: values.mbsMbCosting || undefined,
+          mbsCc: values.mbsCc || undefined,
+          mbsCostRateMkt: values.mbsCostRateMkt ?? undefined,
+          mbsStatus: values.mbsStatus || undefined,
+          mbsLdrPrsn: values.mbsLdrPrsn ?? undefined,
+          mbsFinalProduct: values.mbsFinalProduct || undefined,
         })
       }
       onOpenChange(false)
@@ -219,6 +240,19 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
                   </FormItem>
                 )}
               />
+              <FormField
+                control={form.control}
+                name="mbsCc"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>CC Code</FormLabel>
+                    <FormControl>
+                      <Input {...field} placeholder="e.g. CC-001" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
               <FormField
                 control={form.control}
                 name="mbsDenier"
@@ -261,6 +295,64 @@ export function MBSpinFormDialog({ open, onOpenChange, mbSpin, headId, onSuccess
               )}
             />
 
+            <FormField
+              control={form.control}
+              name="mbsCostRateMkt"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>MB Rate MKT (USD/kg)</FormLabel>
+                  <FormControl>
+                    <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="e.g. 2.500000" disabled={isPending} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="mbsStatus"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Status <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                  <FormControl>
+                    <Input {...field} placeholder="Optional" disabled={isPending} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <div className="grid grid-cols-2 gap-4">
+              <FormField
+                control={form.control}
+                name="mbsLdrPrsn"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>LDR Prsn <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} type="number" step="0.000001" value={field.value ?? ""} placeholder="Optional" disabled={isPending}
+                        onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name="mbsFinalProduct"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Final Product <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                    <FormControl>
+                      <Input {...field} placeholder="Optional" disabled={isPending} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
             {isEditing && (
               <FormField
                 control={form.control}
diff --git a/src/components/finance/mb-spin/mb-spin-table.tsx b/src/components/finance/mb-spin/mb-spin-table.tsx
index 4777f07..5ae852d 100644
--- a/src/components/finance/mb-spin/mb-spin-table.tsx
+++ b/src/components/finance/mb-spin/mb-spin-table.tsx
@@ -27,6 +27,27 @@ export function MBSpinTable({ data, isLoading, onEdit, onDelete }: MBSpinTablePr
       hideOnMobile: true,
       cell: (row) => row.mbsMbCosting || "-",
     },
+    {
+      id: "mbsStatus",
+      header: "Status",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbsStatus || <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mbsFinalProduct",
+      header: "Final Product",
+      hideOnMobile: true,
+      cellClassName: "max-w-[180px] truncate",
+      cell: (row) => row.mbsFinalProduct || <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "mbsCc",
+      header: "Cost Code",
+      width: "w-[110px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbsCc || <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "mbsDenier",
       header: "Denier",
@@ -41,6 +62,15 @@ export function MBSpinTable({ data, isLoading, onEdit, onDelete }: MBSpinTablePr
       hideOnMobile: true,
       cell: (row) => row.mbsFilament ?? "-",
     },
+    {
+      id: "mbsCostRateMkt",
+      header: "Rate MKT",
+      width: "w-[120px]",
+      hideOnMobile: true,
+      cell: (row) => row.mbsCostRateMkt != null
+        ? `$${row.mbsCostRateMkt.toFixed(4)}`
+        : <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "mbsIsActive",
       header: "Status",
diff --git a/src/components/finance/product-grade/product-grade-form-dialog.tsx b/src/components/finance/product-grade/product-grade-form-dialog.tsx
index 0c07a6f..918007a 100644
--- a/src/components/finance/product-grade/product-grade-form-dialog.tsx
+++ b/src/components/finance/product-grade/product-grade-form-dialog.tsx
@@ -41,6 +41,12 @@ const formSchema = z.object({
   bcPerc: z.coerce.number().min(0).max(100),
   nonStdPerc: z.coerce.number().min(0).max(100),
   bcRecoveryRate: z.coerce.number().min(0).max(1),
+  pgDetailProduct: z.string().max(100).optional(),
+  pgGradeLabel: z.string().max(50).optional(),
+  stdSellingPrice: z.coerce.number().min(0).default(0),
+  spValue: z.coerce.number().min(0).default(0),
+  lossPct: z.coerce.number().min(0).optional().nullable(),
+  seqNo:   z.coerce.number().int().min(0).optional().nullable(),
   notes: z.string().max(500).optional(),
   isActive: z.boolean(),
 })
@@ -62,7 +68,7 @@ export function ProductGradeFormDialog({ open, onOpenChange, productGrade, onSuc
   const form = useForm<FormValues>({
     resolver: zodResolver(formSchema) as never,
     defaultValues: {
-      pgCode: "", pgName: "", pgDescription: "", bcPerc: 0, nonStdPerc: 0, bcRecoveryRate: 0.85, notes: "", isActive: true,
+      pgCode: "", pgName: "", pgDescription: "", bcPerc: 0, nonStdPerc: 0, bcRecoveryRate: 0.85, pgDetailProduct: "", pgGradeLabel: "", stdSellingPrice: 0, spValue: 0, lossPct: null, seqNo: null, notes: "", isActive: true,
     },
   })
 
@@ -77,10 +83,16 @@ export function ProductGradeFormDialog({ open, onOpenChange, productGrade, onSuc
               bcPerc: productGrade.bcPerc ?? 0,
               nonStdPerc: productGrade.nonStdPerc ?? 0,
               bcRecoveryRate: productGrade.bcRecoveryRate ?? 0.85,
+              pgDetailProduct: productGrade.pgDetailProduct ?? "",
+              pgGradeLabel: productGrade.pgGradeLabel ?? "",
+              stdSellingPrice: productGrade.stdSellingPrice ?? 0,
+              spValue: productGrade.spValue ?? 0,
+              lossPct: productGrade.lossPct ?? null,
+              seqNo:   productGrade.seqNo ?? null,
               notes: productGrade.notes || "",
               isActive: productGrade.isActive ?? true,
             }
-          : { pgCode: "", pgName: "", pgDescription: "", bcPerc: 0, nonStdPerc: 0, bcRecoveryRate: 0.85, notes: "", isActive: true }
+          : { pgCode: "", pgName: "", pgDescription: "", bcPerc: 0, nonStdPerc: 0, bcRecoveryRate: 0.85, pgDetailProduct: "", pgGradeLabel: "", stdSellingPrice: 0, spValue: 0, lossPct: null, seqNo: null, notes: "", isActive: true }
       )
     }
   }, [open, productGrade, form])
@@ -97,6 +109,12 @@ export function ProductGradeFormDialog({ open, onOpenChange, productGrade, onSuc
             bcPerc: values.bcPerc,
             nonStdPerc: values.nonStdPerc,
             bcRecoveryRate: values.bcRecoveryRate,
+            pgDetailProduct: (values.pgDetailProduct || undefined) as unknown as string,
+            pgGradeLabel: (values.pgGradeLabel || undefined) as unknown as string,
+            stdSellingPrice: values.stdSellingPrice,
+            spValue: values.spValue,
+            lossPct: values.lossPct ?? undefined,
+            seqNo:   values.seqNo != null ? values.seqNo : undefined,
             notes: values.notes,
             isActive: values.isActive,
           },
@@ -109,6 +127,12 @@ export function ProductGradeFormDialog({ open, onOpenChange, productGrade, onSuc
           bcPerc: values.bcPerc,
           nonStdPerc: values.nonStdPerc,
           bcRecoveryRate: values.bcRecoveryRate,
+          pgDetailProduct: (values.pgDetailProduct || undefined) as unknown as string,
+          pgGradeLabel: (values.pgGradeLabel || undefined) as unknown as string,
+          stdSellingPrice: values.stdSellingPrice,
+          spValue: values.spValue,
+          lossPct: values.lossPct ?? undefined,
+          seqNo:   values.seqNo != null ? values.seqNo : undefined,
           notes: values.notes || "",
         })
       }
@@ -205,6 +229,112 @@ export function ProductGradeFormDialog({ open, onOpenChange, productGrade, onSuc
               />
             </div>
 
+            <div className="border-t pt-4 mt-2">
+              <p className="text-sm font-medium text-muted-foreground mb-3">Grade Lookup Fields</p>
+              <div className="grid grid-cols-2 gap-4">
+                <FormField
+                  control={form.control}
+                  name="pgDetailProduct"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Detail Product Pattern</FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder='e.g. "DBR <=600D"' disabled={isPending} />
+                      </FormControl>
+                      <FormDescription>Oracle CMPG_DETAIL_PRODUCT match key</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="pgGradeLabel"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Grade Label</FormLabel>
+                      <FormControl>
+                        <Input {...field} placeholder='e.g. "Type 7 NS"' disabled={isPending} />
+                      </FormControl>
+                      <FormDescription>Value stored in STD_VALUE_LOSS param</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="stdSellingPrice"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Std Selling Price (%)</FormLabel>
+                      <FormControl>
+                        <Input {...field} type="number" step="0.01" min="0" disabled={isPending} />
+                      </FormControl>
+                      <FormDescription>BC_SPECIAL_PROD value</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="spValue"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>SP Value (%)</FormLabel>
+                      <FormControl>
+                        <Input {...field} type="number" step="0.01" min="0" disabled={isPending} />
+                      </FormControl>
+                      <FormDescription>VALUE_LOSS value</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="lossPct"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Loss Factor <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="0.0001"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormDescription>NON_STD_SPECIAL_PROD param</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="seqNo"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Sequence No. <span className="text-xs text-muted-foreground">(optional)</span></FormLabel>
+                      <FormControl>
+                        <Input
+                          type="number"
+                          step="1"
+                          placeholder="Optional"
+                          {...field}
+                          value={field.value ?? ""}
+                          onChange={(e) => field.onChange(e.target.value === "" ? null : Number(e.target.value))}
+                          disabled={isPending}
+                        />
+                      </FormControl>
+                      <FormDescription>Display order</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+            </div>
+
             <FormField
               control={form.control}
               name="pgDescription"
diff --git a/src/components/finance/product-grade/product-grade-table.tsx b/src/components/finance/product-grade/product-grade-table.tsx
index c2dd376..0922bb8 100644
--- a/src/components/finance/product-grade/product-grade-table.tsx
+++ b/src/components/finance/product-grade/product-grade-table.tsx
@@ -47,6 +47,32 @@ export function ProductGradeTable({ data, isLoading, onEdit, onDelete }: Product
       hideOnMobile: true,
       cell: (row) => `${((row.bcRecoveryRate ?? 0) * 100).toFixed(1)}%`,
     },
+    {
+      id: "pgDetailProduct",
+      header: "Detail Pattern",
+      hideOnMobile: true,
+      cell: (row) => row.pgDetailProduct || <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "pgGradeLabel",
+      header: "Grade Label",
+      hideOnMobile: true,
+      cell: (row) => row.pgGradeLabel || <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "stdSellingPrice",
+      header: "Std Price",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.stdSellingPrice != null ? `$${row.stdSellingPrice.toFixed(4)}` : <span className="text-muted-foreground">—</span>,
+    },
+    {
+      id: "spValue",
+      header: "SP Value",
+      width: "w-[100px]",
+      hideOnMobile: true,
+      cell: (row) => row.spValue != null ? row.spValue.toFixed(4) : <span className="text-muted-foreground">—</span>,
+    },
     {
       id: "isActive",
       header: "Status",
diff --git a/src/hooks/finance/use-cost-erp.ts b/src/hooks/finance/use-cost-erp.ts
deleted file mode 100644
index cb3d4a3..0000000
--- a/src/hooks/finance/use-cost-erp.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-"use client"
-
-import { useQuery } from "@tanstack/react-query"
-
-import {
-  type ListErpItemsParams,
-  type ListErpLookupParams,
-  normalizeErpGrade,
-  normalizeErpItem,
-  normalizeErpShade,
-} from "@/types/finance/cost-erp"
-
-const KEYS = {
-  items: (p: ListErpItemsParams) => ["finance", "cost-erp", "items", p] as const,
-  grades: (p: ListErpLookupParams) => ["finance", "cost-erp", "grades", p] as const,
-  shades: (p: ListErpLookupParams) => ["finance", "cost-erp", "shades", p] as const,
-}
-
-export function useErpItems(params: ListErpItemsParams = {}) {
-  return useQuery({
-    queryKey: KEYS.items(params),
-    queryFn: async () => {
-      const qs = new URLSearchParams()
-      if (params.search) qs.set("search", params.search)
-      if (params.itemType) qs.set("itemType", params.itemType)
-      if (params.activeFilter) qs.set("activeFilter", params.activeFilter)
-      if (params.page) qs.set("page", String(params.page))
-      if (params.pageSize) qs.set("pageSize", String(params.pageSize))
-      const res = await fetch(`/api/v1/finance/cost-erp/items?${qs.toString()}`)
-      const json = await res.json()
-      return {
-        items: ((json.data as unknown[]) || []).map((r) =>
-          normalizeErpItem(r as Parameters<typeof normalizeErpItem>[0]),
-        ),
-        pagination: json.pagination,
-      }
-    },
-    staleTime: 5 * 60_000,
-  })
-}
-
-export function useErpGrades(params: ListErpLookupParams = {}) {
-  return useQuery({
-    queryKey: KEYS.grades(params),
-    queryFn: async () => {
-      const qs = new URLSearchParams()
-      if (params.search) qs.set("search", params.search)
-      if (params.activeFilter) qs.set("activeFilter", params.activeFilter)
-      if (params.page) qs.set("page", String(params.page))
-      if (params.pageSize) qs.set("pageSize", String(params.pageSize))
-      const res = await fetch(`/api/v1/finance/cost-erp/grades?${qs.toString()}`)
-      const json = await res.json()
-      return {
-        items: ((json.data as unknown[]) || []).map((r) =>
-          normalizeErpGrade(r as Parameters<typeof normalizeErpGrade>[0]),
-        ),
-        pagination: json.pagination,
-      }
-    },
-    staleTime: 5 * 60_000,
-  })
-}
-
-export function useErpShades(params: ListErpLookupParams = {}) {
-  return useQuery({
-    queryKey: KEYS.shades(params),
-    queryFn: async () => {
-      const qs = new URLSearchParams()
-      if (params.search) qs.set("search", params.search)
-      if (params.activeFilter) qs.set("activeFilter", params.activeFilter)
-      if (params.page) qs.set("page", String(params.page))
-      if (params.pageSize) qs.set("pageSize", String(params.pageSize))
-      const res = await fetch(`/api/v1/finance/cost-erp/shades?${qs.toString()}`)
-      const json = await res.json()
-      return {
-        items: ((json.data as unknown[]) || []).map((r) =>
-          normalizeErpShade(r as Parameters<typeof normalizeErpShade>[0]),
-        ),
-        pagination: json.pagination,
-      }
-    },
-    staleTime: 5 * 60_000,
-  })
-}
diff --git a/src/hooks/finance/use-cost-product-master.ts b/src/hooks/finance/use-cost-product-master.ts
index 2e492ed..c2f1fc0 100644
--- a/src/hooks/finance/use-cost-product-master.ts
+++ b/src/hooks/finance/use-cost-product-master.ts
@@ -7,7 +7,6 @@ import {
   type CreateCostProductMasterPayload,
   type ListCostProductMastersParams,
   type UpdateCostProductMasterPayload,
-  type UpdateErpLinkagePayload,
   normalizeCostProductMaster,
 } from "@/types/finance/cost-product-master"
 
@@ -129,28 +128,6 @@ export function useUpdateCostProductMaster() {
   })
 }
 
-export function useUpdateErpLinkage() {
-  const qc = useQueryClient()
-  return useMutation({
-    mutationFn: async (input: { productSysId: number } & UpdateErpLinkagePayload) => {
-      const { productSysId, ...payload } = input
-      const res = await fetch(`/api/v1/finance/cost-product-masters/${productSysId}/erp-linkage`, {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload),
-      })
-      const json = await res.json()
-      if (!json.base?.isSuccess) throw new Error(json.base?.message || "Failed")
-      return normalizeCostProductMaster(json.data)
-    },
-    onSuccess: () => {
-      toast.success("ERP linkage updated")
-      qc.invalidateQueries({ queryKey: KEYS.all })
-    },
-    onError: (e: Error) => toast.error(e.message),
-  })
-}
-
 export function useDeactivateCostProductMaster() {
   const qc = useQueryClient()
   return useMutation({
diff --git a/src/lib/grpc/clients.ts b/src/lib/grpc/clients.ts
index c030194..f48fc2d 100644
--- a/src/lib/grpc/clients.ts
+++ b/src/lib/grpc/clients.ts
@@ -47,7 +47,6 @@ import { RMGroupServiceDefinition } from "@/types/generated/finance/v1/rm_group"
 import { RMCostServiceDefinition } from "@/types/generated/finance/v1/rm_cost"
 import { CostProductTypeServiceDefinition } from "@/types/generated/finance/v1/cost_product_type"
 import { CostRmTypeServiceDefinition } from "@/types/generated/finance/v1/cost_rm_type"
-import { CostErpLookupServiceDefinition } from "@/types/generated/finance/v1/cost_erp"
 import { CostProductMasterServiceDefinition } from "@/types/generated/finance/v1/cost_product_master"
 import { CostRouteServiceDefinition } from "@/types/generated/finance/v1/cost_route"
 import { CostRequestTypeServiceDefinition } from "@/types/generated/finance/v1/cost_request_type"
@@ -82,8 +81,8 @@ const CHANNEL_OPTIONS = {
   "grpc.keepalive_permit_without_calls": 1,
   "grpc.max_reconnect_backoff_ms": 10000,
   "grpc.initial_reconnect_backoff_ms": 1000,
-  "grpc.max_receive_message_length": 10 * 1024 * 1024,
-  "grpc.max_send_message_length": 10 * 1024 * 1024,
+  "grpc.max_receive_message_length": 100 * 1024 * 1024,
+  "grpc.max_send_message_length": 100 * 1024 * 1024,
   "grpc.enable_retries": 1,
 }
 
@@ -318,11 +317,6 @@ export function getCostRmTypeClient() {
   )
 }
 
-export function getCostErpClient() {
-  return getOrCreate("costErp", () =>
-    createServiceClient(CostErpLookupServiceDefinition, SERVICE_ADDRESSES.finance, insecure, CHANNEL_OPTIONS)
-  )
-}
 
 export function getCostProductMasterClient() {
   return getOrCreate("costProductMaster", () =>
diff --git a/src/lib/grpc/index.ts b/src/lib/grpc/index.ts
index bace6d1..45e654c 100644
--- a/src/lib/grpc/index.ts
+++ b/src/lib/grpc/index.ts
@@ -36,7 +36,6 @@ export {
   getRmCostClient,
   getCostProductTypeClient,
   getCostRmTypeClient,
-  getCostErpClient,
   getCostProductMasterClient,
   getCostRouteClient,
   getCostRequestTypeClient,
diff --git a/src/services/finance/cost-import-api.ts b/src/services/finance/cost-import-api.ts
index ef59a92..37c0083 100644
--- a/src/services/finance/cost-import-api.ts
+++ b/src/services/finance/cost-import-api.ts
@@ -173,6 +173,47 @@ export async function bulkImportProductMasterRouting(
   }
 }
 
+/**
+ * Queue a params-only bulk import (product_parameters + product_applicable_params).
+ * Products must already exist from a prior bulk_product_routing import.
+ * Uses multipart/form-data to send binary bytes without JSON inflation overhead.
+ * Returns a job ID that can be polled with getImportJob().
+ */
+export async function bulkImportParamsOnly(
+  file: File,
+): Promise<{ jobId: number; status: string }> {
+  const formData = new FormData()
+  formData.append("file", file)
+  const res = await fetch(`${BASE}/import/bulk_params_only`, {
+    method: "POST",
+    body: formData, // binary multipart — no Content-Type header needed (browser sets boundary)
+  })
+  if (!res.ok) throw new Error(`Params-only import failed: ${res.status}`)
+  const json = await res.json()
+  if (!json.base?.isSuccess) {
+    throw new Error(json.base?.message || `Import failed`)
+  }
+  return {
+    jobId: json.data?.jobId ?? json.data?.job_id ?? 0,
+    status: json.data?.status ?? "",
+  }
+}
+
+/**
+ * Download the params-only import template (2 sheets: product_parameters + applicable_params).
+ */
+export async function downloadParamsOnlyTemplate(): Promise<void> {
+  const res = await fetch(`${BASE}/template/bulk_params_only`)
+  if (!res.ok) throw new Error(`Template download failed: ${res.status}`)
+  const blob = await res.blob()
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement("a")
+  a.href = url
+  a.download = "bulk_params_only_template.xlsx"
+  a.click()
+  URL.revokeObjectURL(url)
+}
+
 /**
  * Validate a bulk product routing Excel file without importing.
  * Returns a per-sheet summary with error/warning counts and sample errors.
diff --git a/src/types/finance/cost-erp.ts b/src/types/finance/cost-erp.ts
deleted file mode 100644
index 259d805..0000000
--- a/src/types/finance/cost-erp.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// Canonical Phase B — ERP lookups (PRD §7.3, CEI_/CEG_/CES_). Read-only replicas.
-export interface CostErpItem {
-  itemId: number
-  itemCode: string
-  itemName: string
-  itemType: string
-  isActive: boolean
-  syncedAt?: string
-}
-
-export interface CostErpGrade {
-  gradeId: number
-  gradeCode: string
-  gradeName: string
-  isActive: boolean
-  syncedAt?: string
-}
-
-export interface CostErpShade {
-  shadeId: number
-  shadeCode: string
-  shadeName: string
-  isActive: boolean
-  syncedAt?: string
-}
-
-export interface ListErpItemsParams {
-  search?: string
-  itemType?: string
-  activeFilter?: "all" | "active" | "inactive" | ""
-  page?: number
-  pageSize?: number
-}
-
-export interface ListErpLookupParams {
-  search?: string
-  activeFilter?: "all" | "active" | "inactive" | ""
-  page?: number
-  pageSize?: number
-}
-
-type RawItem = {
-  itemId?: number | string
-  item_id?: number | string
-  itemCode?: string
-  item_code?: string
-  itemName?: string
-  item_name?: string
-  itemType?: string
-  item_type?: string
-  isActive?: boolean
-  is_active?: boolean
-  syncedAt?: string
-  synced_at?: string
-}
-
-export function normalizeErpItem(raw: RawItem): CostErpItem {
-  return {
-    itemId: Number(raw.itemId ?? raw.item_id ?? 0),
-    itemCode: raw.itemCode ?? raw.item_code ?? "",
-    itemName: raw.itemName ?? raw.item_name ?? "",
-    itemType: raw.itemType ?? raw.item_type ?? "",
-    isActive: raw.isActive ?? raw.is_active ?? true,
-    syncedAt: raw.syncedAt ?? raw.synced_at,
-  }
-}
-
-type RawGrade = {
-  gradeId?: number | string
-  grade_id?: number | string
-  gradeCode?: string
-  grade_code?: string
-  gradeName?: string
-  grade_name?: string
-  isActive?: boolean
-  is_active?: boolean
-  syncedAt?: string
-  synced_at?: string
-}
-
-export function normalizeErpGrade(raw: RawGrade): CostErpGrade {
-  return {
-    gradeId: Number(raw.gradeId ?? raw.grade_id ?? 0),
-    gradeCode: raw.gradeCode ?? raw.grade_code ?? "",
-    gradeName: raw.gradeName ?? raw.grade_name ?? "",
-    isActive: raw.isActive ?? raw.is_active ?? true,
-    syncedAt: raw.syncedAt ?? raw.synced_at,
-  }
-}
-
-type RawShade = {
-  shadeId?: number | string
-  shade_id?: number | string
-  shadeCode?: string
-  shade_code?: string
-  shadeName?: string
-  shade_name?: string
-  isActive?: boolean
-  is_active?: boolean
-  syncedAt?: string
-  synced_at?: string
-}
-
-export function normalizeErpShade(raw: RawShade): CostErpShade {
-  return {
-    shadeId: Number(raw.shadeId ?? raw.shade_id ?? 0),
-    shadeCode: raw.shadeCode ?? raw.shade_code ?? "",
-    shadeName: raw.shadeName ?? raw.shade_name ?? "",
-    isActive: raw.isActive ?? raw.is_active ?? true,
-    syncedAt: raw.syncedAt ?? raw.synced_at,
-  }
-}
diff --git a/src/types/finance/cost-product-master.ts b/src/types/finance/cost-product-master.ts
index c6c12ee..967ec10 100644
--- a/src/types/finance/cost-product-master.ts
+++ b/src/types/finance/cost-product-master.ts
@@ -9,11 +9,9 @@ export interface CostProductMaster {
   shadeCode: string
   gradeCode: string
   description: string
-  erpItemCode: string
-  erpGradeCode1: string
-  erpGradeCode2: string
-  erpLinkedAt: string
-  erpLinkedBy: string
+  flex01: string
+  flex02: string
+  flex03: string
   isActive: boolean
   createdAt?: string
   createdBy?: string
@@ -38,6 +36,9 @@ export interface CreateCostProductMasterPayload {
   shadeCode: string
   gradeCode: string
   description: string
+  flex01?: string
+  flex02?: string
+  flex03?: string
 }
 
 export interface UpdateCostProductMasterPayload {
@@ -45,12 +46,9 @@ export interface UpdateCostProductMasterPayload {
   shadeCode: string
   gradeCode: string
   description: string
-}
-
-export interface UpdateErpLinkagePayload {
-  erpItemCode: string
-  erpGradeCode1: string
-  erpGradeCode2: string
+  flex01?: string
+  flex02?: string
+  flex03?: string
 }
 
 type Raw = Record<string, unknown> & {
@@ -76,11 +74,9 @@ export function normalizeCostProductMaster(raw: Raw): CostProductMaster {
     shadeCode: str(raw.shadeCode ?? raw.shade_code),
     gradeCode: str(raw.gradeCode ?? raw.grade_code) || "AX",
     description: str(raw.description),
-    erpItemCode: str(raw.erpItemCode ?? raw.erp_item_code),
-    erpGradeCode1: str(raw.erpGradeCode1 ?? raw.erp_grade_code_1 ?? raw.erpGradeCode_1),
-    erpGradeCode2: str(raw.erpGradeCode2 ?? raw.erp_grade_code_2 ?? raw.erpGradeCode_2),
-    erpLinkedAt: str(raw.erpLinkedAt ?? raw.erp_linked_at),
-    erpLinkedBy: str(raw.erpLinkedBy ?? raw.erp_linked_by),
+    flex01: str(raw.flex01 ?? raw.flex_01),
+    flex02: str(raw.flex02 ?? raw.flex_02),
+    flex03: str(raw.flex03 ?? raw.flex_03),
     isActive: (raw.isActive ?? raw.is_active ?? true) as boolean,
     createdAt: raw.audit?.createdAt ?? raw.audit?.created_at,
     createdBy: raw.audit?.createdBy ?? raw.audit?.created_by,
diff --git a/src/types/finance/formula.ts b/src/types/finance/formula.ts
index 8afd859..bb14bff 100644
--- a/src/types/finance/formula.ts
+++ b/src/types/finance/formula.ts
@@ -91,18 +91,34 @@ import {
 // ============================================================================
 
 export const FORMULA_TYPE_LABELS: Record<FormulaType, string> = {
-  [FormulaType.FORMULA_TYPE_UNSPECIFIED]: "All Types",
-  [FormulaType.FORMULA_TYPE_CALCULATION]: "Calculation",
-  [FormulaType.FORMULA_TYPE_SQL_QUERY]: "SQL Query",
-  [FormulaType.FORMULA_TYPE_CONSTANT]: "Constant",
-  [FormulaType.UNRECOGNIZED]: "Unknown",
+  [FormulaType.FORMULA_TYPE_UNSPECIFIED]:    "All Types",
+  [FormulaType.FORMULA_TYPE_CALCULATION]:    "Calculation",
+  [FormulaType.FORMULA_TYPE_SQL_QUERY]:      "SQL Query",
+  [FormulaType.FORMULA_TYPE_CONSTANT]:       "Constant",
+  [FormulaType.FORMULA_TYPE_CONDITIONAL]:    "Conditional",
+  [FormulaType.FORMULA_TYPE_LOOKUP]:         "Lookup",
+  [FormulaType.FORMULA_TYPE_RM_LOOKUP]:      "RM Lookup",
+  [FormulaType.FORMULA_TYPE_FROM_MARKETING]: "From Marketing",
+  [FormulaType.FORMULA_TYPE_INTERMINGLING]:  "Intermingling",
+  [FormulaType.FORMULA_TYPE_SNAPSHOT]:       "Snapshot",
+  [FormulaType.FORMULA_TYPE_PENDING]:        "Pending",
+  [FormulaType.FORMULA_TYPE_INITIAL_VALUE]:  "Initial Value",
+  [FormulaType.UNRECOGNIZED]:                "Unknown",
 }
 
 export const FORMULA_TYPE_OPTIONS = [
-  { value: FormulaType.FORMULA_TYPE_UNSPECIFIED, label: "All Types" },
-  { value: FormulaType.FORMULA_TYPE_CALCULATION, label: "Calculation" },
-  { value: FormulaType.FORMULA_TYPE_SQL_QUERY, label: "SQL Query" },
-  { value: FormulaType.FORMULA_TYPE_CONSTANT, label: "Constant" },
+  { value: FormulaType.FORMULA_TYPE_UNSPECIFIED,    label: "All Types" },
+  { value: FormulaType.FORMULA_TYPE_CALCULATION,    label: "Calculation" },
+  { value: FormulaType.FORMULA_TYPE_SQL_QUERY,      label: "SQL Query" },
+  { value: FormulaType.FORMULA_TYPE_CONSTANT,       label: "Constant" },
+  { value: FormulaType.FORMULA_TYPE_CONDITIONAL,    label: "Conditional" },
+  { value: FormulaType.FORMULA_TYPE_LOOKUP,         label: "Lookup" },
+  { value: FormulaType.FORMULA_TYPE_RM_LOOKUP,      label: "RM Lookup" },
+  { value: FormulaType.FORMULA_TYPE_FROM_MARKETING, label: "From Marketing" },
+  { value: FormulaType.FORMULA_TYPE_INTERMINGLING,  label: "Intermingling" },
+  { value: FormulaType.FORMULA_TYPE_SNAPSHOT,       label: "Snapshot" },
+  { value: FormulaType.FORMULA_TYPE_PENDING,        label: "Pending" },
+  { value: FormulaType.FORMULA_TYPE_INITIAL_VALUE,  label: "Initial Value" },
 ]
 
 export const FORMULA_TYPE_FORM_OPTIONS = FORMULA_TYPE_OPTIONS.filter(
diff --git a/src/types/finance/index.ts b/src/types/finance/index.ts
index 395583d..09689ad 100644
--- a/src/types/finance/index.ts
+++ b/src/types/finance/index.ts
@@ -4,7 +4,6 @@ export * from "./parameter"
 export * from "./formula"
 export * from "./cost-product-type"
 export * from "./cost-rm-type"
-export * from "./cost-erp"
 export * from "./cost-product-master"
 export * from "./cost-route"
 export * from "./cost-request-type"
diff --git a/src/types/generated/finance/v1/cost_erp.ts b/src/types/generated/finance/v1/cost_erp.ts
index 6923a19..96363bc 100644
--- a/src/types/generated/finance/v1/cost_erp.ts
+++ b/src/types/generated/finance/v1/cost_erp.ts
@@ -1281,7 +1281,7 @@ export const ListCostErpShadesResponse: MessageFns<ListCostErpShadesResponse> =
   },
 };
 
-/** CostErpLookupService — read-only lookup for ERP replica tables. */
+/** CostErpLookupService — read-only ERP lookup tables for pickers and autocomplete. */
 export type CostErpLookupServiceDefinition = typeof CostErpLookupServiceDefinition;
 export const CostErpLookupServiceDefinition = {
   name: "CostErpLookupService",
diff --git a/src/types/generated/finance/v1/cost_import.ts b/src/types/generated/finance/v1/cost_import.ts
index b1c965f..5d39441 100644
--- a/src/types/generated/finance/v1/cost_import.ts
+++ b/src/types/generated/finance/v1/cost_import.ts
@@ -133,6 +133,24 @@ export interface ImportBulkProductRoutingResponse {
   status: string;
 }
 
+/**
+ * ImportBulkParamsOnlyRequest imports product_parameters + product_applicable_params
+ * from a file that does NOT contain a product_master sheet. Products must already
+ * exist in the database from a prior bulk import. Supports split part-sheets
+ * (e.g. "product_parameters_p1" + "_p2"). Max 50 MB.
+ */
+export interface ImportBulkParamsOnlyRequest {
+  fileContent: Uint8Array;
+  fileName: string;
+}
+
+/** ImportBulkParamsOnlyResponse returns the created async job ID. */
+export interface ImportBulkParamsOnlyResponse {
+  base: BaseResponse | undefined;
+  jobId: number;
+  status: string;
+}
+
 export interface ValidateBulkProductRoutingFileRequest {
   fileContent: Uint8Array;
   fileName: string;
@@ -2241,6 +2259,188 @@ export const ImportBulkProductRoutingResponse: MessageFns<ImportBulkProductRouti
   },
 };
 
+function createBaseImportBulkParamsOnlyRequest(): ImportBulkParamsOnlyRequest {
+  return { fileContent: new Uint8Array(0), fileName: "" };
+}
+
+export const ImportBulkParamsOnlyRequest: MessageFns<ImportBulkParamsOnlyRequest> = {
+  encode(message: ImportBulkParamsOnlyRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.fileContent.length !== 0) {
+      writer.uint32(10).bytes(message.fileContent);
+    }
+    if (message.fileName !== "") {
+      writer.uint32(18).string(message.fileName);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): ImportBulkParamsOnlyRequest {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseImportBulkParamsOnlyRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.fileContent = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.fileName = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ImportBulkParamsOnlyRequest {
+    return {
+      fileContent: isSet(object.fileContent)
+        ? bytesFromBase64(object.fileContent)
+        : isSet(object.file_content)
+        ? bytesFromBase64(object.file_content)
+        : new Uint8Array(0),
+      fileName: isSet(object.fileName)
+        ? globalThis.String(object.fileName)
+        : isSet(object.file_name)
+        ? globalThis.String(object.file_name)
+        : "",
+    };
+  },
+
+  toJSON(message: ImportBulkParamsOnlyRequest): unknown {
+    const obj: any = {};
+    if (message.fileContent.length !== 0) {
+      obj.fileContent = base64FromBytes(message.fileContent);
+    }
+    if (message.fileName !== "") {
+      obj.fileName = message.fileName;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<ImportBulkParamsOnlyRequest>): ImportBulkParamsOnlyRequest {
+    return ImportBulkParamsOnlyRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<ImportBulkParamsOnlyRequest>): ImportBulkParamsOnlyRequest {
+    const message = createBaseImportBulkParamsOnlyRequest();
+    message.fileContent = object.fileContent ?? new Uint8Array(0);
+    message.fileName = object.fileName ?? "";
+    return message;
+  },
+};
+
+function createBaseImportBulkParamsOnlyResponse(): ImportBulkParamsOnlyResponse {
+  return { base: undefined, jobId: 0, status: "" };
+}
+
+export const ImportBulkParamsOnlyResponse: MessageFns<ImportBulkParamsOnlyResponse> = {
+  encode(message: ImportBulkParamsOnlyResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.base !== undefined) {
+      BaseResponse.encode(message.base, writer.uint32(10).fork()).join();
+    }
+    if (message.jobId !== 0) {
+      writer.uint32(16).int64(message.jobId);
+    }
+    if (message.status !== "") {
+      writer.uint32(26).string(message.status);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): ImportBulkParamsOnlyResponse {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseImportBulkParamsOnlyResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.base = BaseResponse.decode(reader, reader.uint32());
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.jobId = longToNumber(reader.int64());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.status = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ImportBulkParamsOnlyResponse {
+    return {
+      base: isSet(object.base) ? BaseResponse.fromJSON(object.base) : undefined,
+      jobId: isSet(object.jobId)
+        ? globalThis.Number(object.jobId)
+        : isSet(object.job_id)
+        ? globalThis.Number(object.job_id)
+        : 0,
+      status: isSet(object.status) ? globalThis.String(object.status) : "",
+    };
+  },
+
+  toJSON(message: ImportBulkParamsOnlyResponse): unknown {
+    const obj: any = {};
+    if (message.base !== undefined) {
+      obj.base = BaseResponse.toJSON(message.base);
+    }
+    if (message.jobId !== 0) {
+      obj.jobId = Math.round(message.jobId);
+    }
+    if (message.status !== "") {
+      obj.status = message.status;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<ImportBulkParamsOnlyResponse>): ImportBulkParamsOnlyResponse {
+    return ImportBulkParamsOnlyResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<ImportBulkParamsOnlyResponse>): ImportBulkParamsOnlyResponse {
+    const message = createBaseImportBulkParamsOnlyResponse();
+    message.base = (object.base !== undefined && object.base !== null)
+      ? BaseResponse.fromPartial(object.base)
+      : undefined;
+    message.jobId = object.jobId ?? 0;
+    message.status = object.status ?? "";
+    return message;
+  },
+};
+
 function createBaseValidateBulkProductRoutingFileRequest(): ValidateBulkProductRoutingFileRequest {
   return { fileContent: new Uint8Array(0), fileName: "" };
 }
@@ -2736,6 +2936,18 @@ export const CostDataImportServiceDefinition = {
       responseStream: false,
       options: {},
     },
+    /**
+     * ImportBulkParamsOnly imports product parameters from a params-only file.
+     * Products must already exist in the database from a prior bulk import run.
+     */
+    importBulkParamsOnly: {
+      name: "ImportBulkParamsOnly",
+      requestType: ImportBulkParamsOnlyRequest,
+      requestStream: false,
+      responseType: ImportBulkParamsOnlyResponse,
+      responseStream: false,
+      options: {},
+    },
     validateBulkProductRoutingFile: {
       name: "ValidateBulkProductRoutingFile",
       requestType: ValidateBulkProductRoutingFileRequest,
diff --git a/src/types/generated/finance/v1/cost_product_master.ts b/src/types/generated/finance/v1/cost_product_master.ts
index d26b1e4..fb451f8 100644
--- a/src/types/generated/finance/v1/cost_product_master.ts
+++ b/src/types/generated/finance/v1/cost_product_master.ts
@@ -42,6 +42,12 @@ export interface CreateCostProductMasterRequest {
   shadeCode: string;
   gradeCode: string;
   description: string;
+  /** Legacy / import identifiers — plain text, no validation constraint. */
+  flex01: string;
+  /** legacy_oracle_sys_id */
+  flex02: string;
+  /** legacy_type_label */
+  flex03: string;
 }
 
 export interface CreateCostProductMasterResponse {
@@ -73,6 +79,12 @@ export interface UpdateCostProductMasterRequest {
   shadeCode: string;
   gradeCode: string;
   description: string;
+  /** Legacy / import identifiers — plain text, no validation constraint. */
+  flex01: string;
+  /** legacy_oracle_sys_id */
+  flex02: string;
+  /** legacy_type_label */
+  flex03: string;
 }
 
 export interface UpdateCostProductMasterResponse {
@@ -609,7 +621,16 @@ export const CostProductMaster: MessageFns<CostProductMaster> = {
 };
 
 function createBaseCreateCostProductMasterRequest(): CreateCostProductMasterRequest {
-  return { productTypeId: 0, productName: "", shadeCode: "", gradeCode: "", description: "" };
+  return {
+    productTypeId: 0,
+    productName: "",
+    shadeCode: "",
+    gradeCode: "",
+    description: "",
+    flex01: "",
+    flex02: "",
+    flex03: "",
+  };
 }
 
 export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterRequest> = {
@@ -629,6 +650,15 @@ export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterR
     if (message.description !== "") {
       writer.uint32(42).string(message.description);
     }
+    if (message.flex01 !== "") {
+      writer.uint32(50).string(message.flex01);
+    }
+    if (message.flex02 !== "") {
+      writer.uint32(58).string(message.flex02);
+    }
+    if (message.flex03 !== "") {
+      writer.uint32(66).string(message.flex03);
+    }
     return writer;
   },
 
@@ -679,6 +709,30 @@ export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterR
           message.description = reader.string();
           continue;
         }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+
+          message.flex01 = reader.string();
+          continue;
+        }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+
+          message.flex02 = reader.string();
+          continue;
+        }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.flex03 = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -711,6 +765,21 @@ export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterR
         ? globalThis.String(object.grade_code)
         : "",
       description: isSet(object.description) ? globalThis.String(object.description) : "",
+      flex01: isSet(object.flex01)
+        ? globalThis.String(object.flex01)
+        : isSet(object.flex_01)
+        ? globalThis.String(object.flex_01)
+        : "",
+      flex02: isSet(object.flex02)
+        ? globalThis.String(object.flex02)
+        : isSet(object.flex_02)
+        ? globalThis.String(object.flex_02)
+        : "",
+      flex03: isSet(object.flex03)
+        ? globalThis.String(object.flex03)
+        : isSet(object.flex_03)
+        ? globalThis.String(object.flex_03)
+        : "",
     };
   },
 
@@ -731,6 +800,15 @@ export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterR
     if (message.description !== "") {
       obj.description = message.description;
     }
+    if (message.flex01 !== "") {
+      obj.flex01 = message.flex01;
+    }
+    if (message.flex02 !== "") {
+      obj.flex02 = message.flex02;
+    }
+    if (message.flex03 !== "") {
+      obj.flex03 = message.flex03;
+    }
     return obj;
   },
 
@@ -744,6 +822,9 @@ export const CreateCostProductMasterRequest: MessageFns<CreateCostProductMasterR
     message.shadeCode = object.shadeCode ?? "";
     message.gradeCode = object.gradeCode ?? "";
     message.description = object.description ?? "";
+    message.flex01 = object.flex01 ?? "";
+    message.flex02 = object.flex02 ?? "";
+    message.flex03 = object.flex03 ?? "";
     return message;
   },
 };
@@ -1117,7 +1198,16 @@ export const GetCostProductMasterByCodeResponse: MessageFns<GetCostProductMaster
 };
 
 function createBaseUpdateCostProductMasterRequest(): UpdateCostProductMasterRequest {
-  return { productSysId: 0, productName: "", shadeCode: "", gradeCode: "", description: "" };
+  return {
+    productSysId: 0,
+    productName: "",
+    shadeCode: "",
+    gradeCode: "",
+    description: "",
+    flex01: "",
+    flex02: "",
+    flex03: "",
+  };
 }
 
 export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterRequest> = {
@@ -1137,6 +1227,15 @@ export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterR
     if (message.description !== "") {
       writer.uint32(42).string(message.description);
     }
+    if (message.flex01 !== "") {
+      writer.uint32(50).string(message.flex01);
+    }
+    if (message.flex02 !== "") {
+      writer.uint32(58).string(message.flex02);
+    }
+    if (message.flex03 !== "") {
+      writer.uint32(66).string(message.flex03);
+    }
     return writer;
   },
 
@@ -1187,6 +1286,30 @@ export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterR
           message.description = reader.string();
           continue;
         }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+
+          message.flex01 = reader.string();
+          continue;
+        }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+
+          message.flex02 = reader.string();
+          continue;
+        }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.flex03 = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1219,6 +1342,21 @@ export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterR
         ? globalThis.String(object.grade_code)
         : "",
       description: isSet(object.description) ? globalThis.String(object.description) : "",
+      flex01: isSet(object.flex01)
+        ? globalThis.String(object.flex01)
+        : isSet(object.flex_01)
+        ? globalThis.String(object.flex_01)
+        : "",
+      flex02: isSet(object.flex02)
+        ? globalThis.String(object.flex02)
+        : isSet(object.flex_02)
+        ? globalThis.String(object.flex_02)
+        : "",
+      flex03: isSet(object.flex03)
+        ? globalThis.String(object.flex03)
+        : isSet(object.flex_03)
+        ? globalThis.String(object.flex_03)
+        : "",
     };
   },
 
@@ -1239,6 +1377,15 @@ export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterR
     if (message.description !== "") {
       obj.description = message.description;
     }
+    if (message.flex01 !== "") {
+      obj.flex01 = message.flex01;
+    }
+    if (message.flex02 !== "") {
+      obj.flex02 = message.flex02;
+    }
+    if (message.flex03 !== "") {
+      obj.flex03 = message.flex03;
+    }
     return obj;
   },
 
@@ -1252,6 +1399,9 @@ export const UpdateCostProductMasterRequest: MessageFns<UpdateCostProductMasterR
     message.shadeCode = object.shadeCode ?? "";
     message.gradeCode = object.gradeCode ?? "";
     message.description = object.description ?? "";
+    message.flex01 = object.flex01 ?? "";
+    message.flex02 = object.flex02 ?? "";
+    message.flex03 = object.flex03 ?? "";
     return message;
   },
 };
diff --git a/src/types/generated/finance/v1/formula.ts b/src/types/generated/finance/v1/formula.ts
index d9347db..f4736fb 100644
--- a/src/types/generated/finance/v1/formula.ts
+++ b/src/types/generated/finance/v1/formula.ts
@@ -21,6 +21,22 @@ export enum FormulaType {
   FORMULA_TYPE_SQL_QUERY = 2,
   /** FORMULA_TYPE_CONSTANT - Constant value (no calculation). */
   FORMULA_TYPE_CONSTANT = 3,
+  /** FORMULA_TYPE_CONDITIONAL - Conditional expression with if/else branching. */
+  FORMULA_TYPE_CONDITIONAL = 4,
+  /** FORMULA_TYPE_LOOKUP - Lookup from a master table via param code. */
+  FORMULA_TYPE_LOOKUP = 5,
+  /** FORMULA_TYPE_RM_LOOKUP - Lookup using RM group cost rates. */
+  FORMULA_TYPE_RM_LOOKUP = 6,
+  /** FORMULA_TYPE_FROM_MARKETING - Copy value from the SELLING (marketing) session result. */
+  FORMULA_TYPE_FROM_MARKETING = 7,
+  /** FORMULA_TYPE_INTERMINGLING - Intermingling cost lookup. */
+  FORMULA_TYPE_INTERMINGLING = 8,
+  /** FORMULA_TYPE_SNAPSHOT - Snapshot of a previously computed value. */
+  FORMULA_TYPE_SNAPSHOT = 9,
+  /** FORMULA_TYPE_PENDING - Placeholder — formula not yet defined. */
+  FORMULA_TYPE_PENDING = 10,
+  /** FORMULA_TYPE_INITIAL_VALUE - Seeds an initial value before the formula chain starts. */
+  FORMULA_TYPE_INITIAL_VALUE = 11,
   UNRECOGNIZED = -1,
 }
 
@@ -38,6 +54,30 @@ export function formulaTypeFromJSON(object: any): FormulaType {
     case 3:
     case "FORMULA_TYPE_CONSTANT":
       return FormulaType.FORMULA_TYPE_CONSTANT;
+    case 4:
+    case "FORMULA_TYPE_CONDITIONAL":
+      return FormulaType.FORMULA_TYPE_CONDITIONAL;
+    case 5:
+    case "FORMULA_TYPE_LOOKUP":
+      return FormulaType.FORMULA_TYPE_LOOKUP;
+    case 6:
+    case "FORMULA_TYPE_RM_LOOKUP":
+      return FormulaType.FORMULA_TYPE_RM_LOOKUP;
+    case 7:
+    case "FORMULA_TYPE_FROM_MARKETING":
+      return FormulaType.FORMULA_TYPE_FROM_MARKETING;
+    case 8:
+    case "FORMULA_TYPE_INTERMINGLING":
+      return FormulaType.FORMULA_TYPE_INTERMINGLING;
+    case 9:
+    case "FORMULA_TYPE_SNAPSHOT":
+      return FormulaType.FORMULA_TYPE_SNAPSHOT;
+    case 10:
+    case "FORMULA_TYPE_PENDING":
+      return FormulaType.FORMULA_TYPE_PENDING;
+    case 11:
+    case "FORMULA_TYPE_INITIAL_VALUE":
+      return FormulaType.FORMULA_TYPE_INITIAL_VALUE;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -55,6 +95,22 @@ export function formulaTypeToJSON(object: FormulaType): string {
       return "FORMULA_TYPE_SQL_QUERY";
     case FormulaType.FORMULA_TYPE_CONSTANT:
       return "FORMULA_TYPE_CONSTANT";
+    case FormulaType.FORMULA_TYPE_CONDITIONAL:
+      return "FORMULA_TYPE_CONDITIONAL";
+    case FormulaType.FORMULA_TYPE_LOOKUP:
+      return "FORMULA_TYPE_LOOKUP";
+    case FormulaType.FORMULA_TYPE_RM_LOOKUP:
+      return "FORMULA_TYPE_RM_LOOKUP";
+    case FormulaType.FORMULA_TYPE_FROM_MARKETING:
+      return "FORMULA_TYPE_FROM_MARKETING";
+    case FormulaType.FORMULA_TYPE_INTERMINGLING:
+      return "FORMULA_TYPE_INTERMINGLING";
+    case FormulaType.FORMULA_TYPE_SNAPSHOT:
+      return "FORMULA_TYPE_SNAPSHOT";
+    case FormulaType.FORMULA_TYPE_PENDING:
+      return "FORMULA_TYPE_PENDING";
+    case FormulaType.FORMULA_TYPE_INITIAL_VALUE:
+      return "FORMULA_TYPE_INITIAL_VALUE";
     case FormulaType.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
diff --git a/src/types/generated/finance/v1/yarn_master.ts b/src/types/generated/finance/v1/yarn_master.ts
index d3da4bd..1f69b2f 100644
--- a/src/types/generated/finance/v1/yarn_master.ts
+++ b/src/types/generated/finance/v1/yarn_master.ts
@@ -114,8 +114,68 @@ export interface Machine {
   isActive: boolean;
   /** Optional notes. */
   notes: string;
+  /** Optional manpower cost per day in USD. */
+  mpPerDay?:
+    | number
+    | undefined;
+  /** Optional overhead per head per day in USD. */
+  ohsPerDay?:
+    | number
+    | undefined;
   /** Audit metadata. */
-  audit: AuditInfo | undefined;
+  audit:
+    | AuditInfo
+    | undefined;
+  /** Optional spares cost per day in USD. */
+  sparesPerDay?:
+    | number
+    | undefined;
+  /** Optional change-over quality loss in kgs. */
+  kgsLostChange?:
+    | number
+    | undefined;
+  /** Optional volume bucket 1 quantity threshold. */
+  vb1Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 2 quantity threshold. */
+  vb2Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 3 quantity threshold. */
+  vb3Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 4 quantity threshold. */
+  vb4Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 5 quantity threshold. */
+  vb5Qty?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_POY_BOBBIN_WEIGHT — kg per bobbin. */
+  mcPoyBobbinWeight?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_TOT_FXD_CST — total fixed cost. */
+  mcTotFxdCst?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_BOBBIN_PER_TROLLY — bobbins per trolley. */
+  mcBobbinPerTrolly?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_BOX_COST — box cost per unit. */
+  mcBoxCost?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_CAPTIVE_PER_BOBBIN — captive cost per bobbin. */
+  mcCaptivePerBobbin?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_WEIGHTAGE — machine weightage factor. */
+  mcWeightage?: number | undefined;
 }
 
 /** CreateMachineRequest is the request for creating a machine. */
@@ -146,6 +206,64 @@ export interface CreateMachineRequest {
     | undefined;
   /** Optional notes (max 1000 chars). */
   notes: string;
+  /** Optional manpower cost per day in USD. */
+  mpPerDay?:
+    | number
+    | undefined;
+  /** Optional overhead per head per day in USD. */
+  ohsPerDay?:
+    | number
+    | undefined;
+  /** Optional spares cost per day in USD. */
+  sparesPerDay?:
+    | number
+    | undefined;
+  /** Optional change-over quality loss in kgs. */
+  kgsLostChange?:
+    | number
+    | undefined;
+  /** Optional volume bucket 1 quantity threshold. */
+  vb1Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 2 quantity threshold. */
+  vb2Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 3 quantity threshold. */
+  vb3Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 4 quantity threshold. */
+  vb4Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 5 quantity threshold. */
+  vb5Qty?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_POY_BOBBIN_WEIGHT (≥ 0). */
+  mcPoyBobbinWeight?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_TOT_FXD_CST (≥ 0). */
+  mcTotFxdCst?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_BOBBIN_PER_TROLLY (≥ 0). */
+  mcBobbinPerTrolly?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_BOX_COST (≥ 0). */
+  mcBoxCost?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_CAPTIVE_PER_BOBBIN (≥ 0). */
+  mcCaptivePerBobbin?:
+    | number
+    | undefined;
+  /** Optional Oracle CMM_WEIGHTAGE (≥ 0). */
+  mcWeightage?: number | undefined;
 }
 
 /** CreateMachineResponse is the response for creating a machine. */
@@ -219,7 +337,67 @@ export interface UpdateMachineRequest {
     | string
     | undefined;
   /** Updated active status. */
-  isActive?: boolean | undefined;
+  isActive?:
+    | boolean
+    | undefined;
+  /** Optional manpower cost per day in USD. */
+  mpPerDay?:
+    | number
+    | undefined;
+  /** Optional overhead per head per day in USD. */
+  ohsPerDay?:
+    | number
+    | undefined;
+  /** Optional spares cost per day in USD. */
+  sparesPerDay?:
+    | number
+    | undefined;
+  /** Optional change-over quality loss in kgs. */
+  kgsLostChange?:
+    | number
+    | undefined;
+  /** Optional volume bucket 1 quantity threshold. */
+  vb1Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 2 quantity threshold. */
+  vb2Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 3 quantity threshold. */
+  vb3Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 4 quantity threshold. */
+  vb4Qty?:
+    | number
+    | undefined;
+  /** Optional volume bucket 5 quantity threshold. */
+  vb5Qty?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_POY_BOBBIN_WEIGHT (≥ 0). */
+  mcPoyBobbinWeight?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_TOT_FXD_CST (≥ 0). */
+  mcTotFxdCst?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_BOBBIN_PER_TROLLY (≥ 0). */
+  mcBobbinPerTrolly?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_BOX_COST (≥ 0). */
+  mcBoxCost?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_CAPTIVE_PER_BOBBIN (≥ 0). */
+  mcCaptivePerBobbin?:
+    | number
+    | undefined;
+  /** Optional updated Oracle CMM_WEIGHTAGE (≥ 0). */
+  mcWeightage?: number | undefined;
 }
 
 /** UpdateMachineResponse is the response for updating a machine. */
@@ -376,8 +554,40 @@ export interface BoxBobbinCost {
   notes: string;
   /** Period-specific rate entries. */
   rates: BoxBobbinCostRate[];
+  /** Optional bobbin reuse count (from Oracle CMBBC_BBN_REUSE). */
+  bbnReuse?:
+    | number
+    | undefined;
+  /** Optional box reuse count (from Oracle CMBBC_BOX_REUSE). */
+  boxReuse?:
+    | number
+    | undefined;
+  /** Optional MKT box rate in USD/box (param CAPTIVE/DELIVERY_BOX_RATE MKT). */
+  boxCost?:
+    | number
+    | undefined;
+  /** Optional MKT bobbin rate in USD/bobbin (param CAPTIVE/DELIVERY_BOB_RATE MKT). */
+  bobinCost?:
+    | number
+    | undefined;
+  /** Optional VAL box rate in USD/box (param CAPTIVE/DELIVERY_BOX_RATE VAL). */
+  boxCostVal?:
+    | number
+    | undefined;
+  /** Optional VAL bobbin rate in USD/bobbin (param CAPTIVE/DELIVERY_BOB_RATE VAL). */
+  bobinCostVal?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBBC_BBN_REUSE_VAL — bobbin reuse count for VAL session. */
+  bbnReuseVal?:
+    | number
+    | undefined;
   /** Audit metadata. */
-  audit: AuditInfo | undefined;
+  audit:
+    | AuditInfo
+    | undefined;
+  /** Optional Oracle CMBBC_BOX_REUSE_VAL — box reuse count for VAL session. */
+  boxReuseVal?: number | undefined;
 }
 
 /** CreateBoxBobbinCostRequest is the request for creating a Box Bobbin Cost config. */
@@ -392,6 +602,36 @@ export interface CreateBoxBobbinCostRequest {
   noOfBob: number;
   /** Optional notes (max 1000 chars). */
   notes: string;
+  /** Optional bobbin reuse count (≥ 0). */
+  bbnReuse?:
+    | number
+    | undefined;
+  /** Optional box reuse count (≥ 0). */
+  boxReuse?:
+    | number
+    | undefined;
+  /** Optional MKT box rate in USD/box (≥ 0). */
+  boxCost?:
+    | number
+    | undefined;
+  /** Optional MKT bobbin rate in USD/bobbin (≥ 0). */
+  bobinCost?:
+    | number
+    | undefined;
+  /** Optional VAL box rate in USD/box (≥ 0). */
+  boxCostVal?:
+    | number
+    | undefined;
+  /** Optional VAL bobbin rate in USD/bobbin (≥ 0). */
+  bobinCostVal?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBBC_BBN_REUSE_VAL (≥ 0). */
+  bbnReuseVal?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBBC_BOX_REUSE_VAL (≥ 0). */
+  boxReuseVal?: number | undefined;
 }
 
 /** CreateBoxBobbinCostResponse is the response for creating a Box Bobbin Cost config. */
@@ -441,7 +681,39 @@ export interface UpdateBoxBobbinCostRequest {
     | string
     | undefined;
   /** Updated active status. */
-  isActive?: boolean | undefined;
+  isActive?:
+    | boolean
+    | undefined;
+  /** Optional updated bobbin reuse count (≥ 0). */
+  bbnReuse?:
+    | number
+    | undefined;
+  /** Optional updated box reuse count (≥ 0). */
+  boxReuse?:
+    | number
+    | undefined;
+  /** Optional updated MKT box rate in USD/box (≥ 0). */
+  boxCost?:
+    | number
+    | undefined;
+  /** Optional updated MKT bobbin rate in USD/bobbin (≥ 0). */
+  bobinCost?:
+    | number
+    | undefined;
+  /** Optional updated VAL box rate in USD/box (≥ 0). */
+  boxCostVal?:
+    | number
+    | undefined;
+  /** Optional updated VAL bobbin rate in USD/bobbin (≥ 0). */
+  bobinCostVal?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBBC_BBN_REUSE_VAL (≥ 0). */
+  bbnReuseVal?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBBC_BOX_REUSE_VAL (≥ 0). */
+  boxReuseVal?: number | undefined;
 }
 
 /** UpdateBoxBobbinCostResponse is the response for updating a Box Bobbin Cost config. */
@@ -804,6 +1076,22 @@ export interface ProductGrade {
   isActive: boolean;
   /** Optional notes. */
   notes: string;
+  /** Pattern match key (e.g., "DBR <=600D"). */
+  pgDetailProduct: string;
+  /** Grade label for STD_VALUE_LOSS. */
+  pgGradeLabel: string;
+  /** BC_SPECIAL_PROD rate. */
+  stdSellingPrice: number;
+  /** VALUE_LOSS rate. */
+  spValue: number;
+  /** Optional loss factor (param NON_STD_SPECIAL_PROD, from Oracle CMPG_LOSS). */
+  lossPct?:
+    | number
+    | undefined;
+  /** Optional display sequence number (from Oracle CMPG_SEQ_NO). */
+  seqNo?:
+    | number
+    | undefined;
   /** Audit metadata. */
   audit: AuditInfo | undefined;
 }
@@ -824,6 +1112,20 @@ export interface CreateProductGradeRequest {
   bcRecoveryRate: number;
   /** Optional notes (max 1000 chars). */
   notes: string;
+  /** Pattern match key (max 100 chars). */
+  pgDetailProduct: string;
+  /** Grade label for STD_VALUE_LOSS (max 50 chars). */
+  pgGradeLabel: string;
+  /** BC_SPECIAL_PROD rate (≥ 0). */
+  stdSellingPrice: number;
+  /** VALUE_LOSS rate (≥ 0). */
+  spValue: number;
+  /** Optional loss factor (≥ 0). */
+  lossPct?:
+    | number
+    | undefined;
+  /** Optional display sequence number (≥ 0). */
+  seqNo?: number | undefined;
 }
 
 /** CreateProductGradeResponse is the response for creating a Product Grade. */
@@ -881,7 +1183,31 @@ export interface UpdateProductGradeRequest {
     | string
     | undefined;
   /** Updated active status. */
-  isActive?: boolean | undefined;
+  isActive?:
+    | boolean
+    | undefined;
+  /** Optional pattern match key (max 100 chars). */
+  pgDetailProduct?:
+    | string
+    | undefined;
+  /** Optional grade label for STD_VALUE_LOSS (max 50 chars). */
+  pgGradeLabel?:
+    | string
+    | undefined;
+  /** Optional BC_SPECIAL_PROD rate (≥ 0). */
+  stdSellingPrice?:
+    | number
+    | undefined;
+  /** Optional VALUE_LOSS rate (≥ 0). */
+  spValue?:
+    | number
+    | undefined;
+  /** Optional updated loss factor (≥ 0). */
+  lossPct?:
+    | number
+    | undefined;
+  /** Optional updated display sequence number (≥ 0). */
+  seqNo?: number | undefined;
 }
 
 /** UpdateProductGradeResponse is the response for updating a Product Grade. */
@@ -1018,6 +1344,26 @@ export interface MBHead {
     | undefined;
   /** Whether the record is active. */
   mbhIsActive: boolean;
+  /** Optional Oracle CMBH_CHECK_STATUS — check status (Waiting/Current/Approved). */
+  mbhCheckStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_STATUS — head status (R and D/Spinning/Boughtout). */
+  mbhStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_LDR_PRSN — LDR person value. */
+  mbhLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBH_FINAL_PRODUCT — final product description. */
+  mbhFinalProduct?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_CODE — product code. */
+  mbhCode?:
+    | string
+    | undefined;
   /** Audit metadata. */
   audit: AuditInfo | undefined;
 }
@@ -1043,7 +1389,27 @@ export interface CreateMBHeadRequest {
     | number
     | undefined;
   /** Optional dozing percentage. */
-  mbhDozing?: number | undefined;
+  mbhDozing?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBH_CHECK_STATUS (max 50 chars). */
+  mbhCheckStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_STATUS (max 100 chars). */
+  mbhStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_LDR_PRSN (≥ 0). */
+  mbhLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBH_FINAL_PRODUCT (max 200 chars). */
+  mbhFinalProduct?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_CODE (max 100 chars). */
+  mbhCode?: string | undefined;
 }
 
 /** CreateMBHeadResponse is the response for creating an MB Head record. */
@@ -1097,7 +1463,27 @@ export interface UpdateMBHeadRequest {
     | number
     | undefined;
   /** Updated active status. */
-  mbhIsActive?: boolean | undefined;
+  mbhIsActive?:
+    | boolean
+    | undefined;
+  /** Optional Oracle CMBH_CHECK_STATUS (max 50 chars). */
+  mbhCheckStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_STATUS (max 100 chars). */
+  mbhStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_LDR_PRSN (≥ 0). */
+  mbhLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBH_FINAL_PRODUCT (max 200 chars). */
+  mbhFinalProduct?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBH_CODE (max 100 chars). */
+  mbhCode?: string | undefined;
 }
 
 /** UpdateMBHeadResponse is the response for updating an MB Head record. */
@@ -1236,6 +1622,26 @@ export interface MBSpin {
   mbsMbCosting: string;
   /** Whether the record is active. */
   mbsIsActive: boolean;
+  /** Optional MB/SP cost code. */
+  mbsCc?:
+    | string
+    | undefined;
+  /** Optional MB rate MKT in USD/kg. */
+  mbsCostRateMkt?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_STATUS — spinning status (Spinning/R and D/Boughtout). */
+  mbsStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBS_LDR_PRSN — LDR person value. */
+  mbsLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_FINAL_PRODUCT — final product description. */
+  mbsFinalProduct?:
+    | string
+    | undefined;
   /** Audit metadata. */
   audit: AuditInfo | undefined;
 }
@@ -1263,7 +1669,27 @@ export interface CreateMBSpinRequest {
     | number
     | undefined;
   /** Optional spin cost code (max 100 chars). */
-  mbsMbCosting?: string | undefined;
+  mbsMbCosting?:
+    | string
+    | undefined;
+  /** Optional MB/SP cost code (max 100 chars). */
+  mbsCc?:
+    | string
+    | undefined;
+  /** Optional MB rate MKT in USD/kg. */
+  mbsCostRateMkt?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_STATUS (max 100 chars). */
+  mbsStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBS_LDR_PRSN (≥ 0). */
+  mbsLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_FINAL_PRODUCT (max 200 chars). */
+  mbsFinalProduct?: string | undefined;
 }
 
 /** CreateMBSpinResponse is the response for creating an MB Spin record. */
@@ -1321,7 +1747,27 @@ export interface UpdateMBSpinRequest {
     | string
     | undefined;
   /** Updated active status. */
-  mbsIsActive?: boolean | undefined;
+  mbsIsActive?:
+    | boolean
+    | undefined;
+  /** Optional MB/SP cost code (max 100 chars). */
+  mbsCc?:
+    | string
+    | undefined;
+  /** Optional MB rate MKT in USD/kg. */
+  mbsCostRateMkt?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_STATUS (max 100 chars). */
+  mbsStatus?:
+    | string
+    | undefined;
+  /** Optional Oracle CMBS_LDR_PRSN (≥ 0). */
+  mbsLdrPrsn?:
+    | number
+    | undefined;
+  /** Optional Oracle CMBS_FINAL_PRODUCT (max 200 chars). */
+  mbsFinalProduct?: string | undefined;
 }
 
 /** UpdateMBSpinResponse is the response for updating an MB Spin record. */
@@ -1680,7 +2126,22 @@ function createBaseMachine(): Machine {
     powerPerDay: undefined,
     isActive: false,
     notes: "",
+    mpPerDay: undefined,
+    ohsPerDay: undefined,
     audit: undefined,
+    sparesPerDay: undefined,
+    kgsLostChange: undefined,
+    vb1Qty: undefined,
+    vb2Qty: undefined,
+    vb3Qty: undefined,
+    vb4Qty: undefined,
+    vb5Qty: undefined,
+    mcPoyBobbinWeight: undefined,
+    mcTotFxdCst: undefined,
+    mcBobbinPerTrolly: undefined,
+    mcBoxCost: undefined,
+    mcCaptivePerBobbin: undefined,
+    mcWeightage: undefined,
   };
 }
 
@@ -1725,9 +2186,54 @@ export const Machine: MessageFns<Machine> = {
     if (message.notes !== "") {
       writer.uint32(106).string(message.notes);
     }
+    if (message.mpPerDay !== undefined) {
+      writer.uint32(113).double(message.mpPerDay);
+    }
+    if (message.ohsPerDay !== undefined) {
+      writer.uint32(121).double(message.ohsPerDay);
+    }
     if (message.audit !== undefined) {
       AuditInfo.encode(message.audit, writer.uint32(130).fork()).join();
     }
+    if (message.sparesPerDay !== undefined) {
+      writer.uint32(137).double(message.sparesPerDay);
+    }
+    if (message.kgsLostChange !== undefined) {
+      writer.uint32(145).double(message.kgsLostChange);
+    }
+    if (message.vb1Qty !== undefined) {
+      writer.uint32(153).double(message.vb1Qty);
+    }
+    if (message.vb2Qty !== undefined) {
+      writer.uint32(161).double(message.vb2Qty);
+    }
+    if (message.vb3Qty !== undefined) {
+      writer.uint32(169).double(message.vb3Qty);
+    }
+    if (message.vb4Qty !== undefined) {
+      writer.uint32(177).double(message.vb4Qty);
+    }
+    if (message.vb5Qty !== undefined) {
+      writer.uint32(185).double(message.vb5Qty);
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      writer.uint32(193).double(message.mcPoyBobbinWeight);
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      writer.uint32(201).double(message.mcTotFxdCst);
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      writer.uint32(209).double(message.mcBobbinPerTrolly);
+    }
+    if (message.mcBoxCost !== undefined) {
+      writer.uint32(217).double(message.mcBoxCost);
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      writer.uint32(225).double(message.mcCaptivePerBobbin);
+    }
+    if (message.mcWeightage !== undefined) {
+      writer.uint32(233).double(message.mcWeightage);
+    }
     return writer;
   },
 
@@ -1842,6 +2348,22 @@ export const Machine: MessageFns<Machine> = {
           message.notes = reader.string();
           continue;
         }
+        case 14: {
+          if (tag !== 113) {
+            break;
+          }
+
+          message.mpPerDay = reader.double();
+          continue;
+        }
+        case 15: {
+          if (tag !== 121) {
+            break;
+          }
+
+          message.ohsPerDay = reader.double();
+          continue;
+        }
         case 16: {
           if (tag !== 130) {
             break;
@@ -1850,24 +2372,128 @@ export const Machine: MessageFns<Machine> = {
           message.audit = AuditInfo.decode(reader, reader.uint32());
           continue;
         }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
+        case 17: {
+          if (tag !== 137) {
+            break;
+          }
 
-  fromJSON(object: any): Machine {
-    return {
-      machineId: isSet(object.machineId)
-        ? globalThis.String(object.machineId)
-        : isSet(object.machine_id)
-        ? globalThis.String(object.machine_id)
-        : "",
-      machineCode: isSet(object.machineCode)
-        ? globalThis.String(object.machineCode)
+          message.sparesPerDay = reader.double();
+          continue;
+        }
+        case 18: {
+          if (tag !== 145) {
+            break;
+          }
+
+          message.kgsLostChange = reader.double();
+          continue;
+        }
+        case 19: {
+          if (tag !== 153) {
+            break;
+          }
+
+          message.vb1Qty = reader.double();
+          continue;
+        }
+        case 20: {
+          if (tag !== 161) {
+            break;
+          }
+
+          message.vb2Qty = reader.double();
+          continue;
+        }
+        case 21: {
+          if (tag !== 169) {
+            break;
+          }
+
+          message.vb3Qty = reader.double();
+          continue;
+        }
+        case 22: {
+          if (tag !== 177) {
+            break;
+          }
+
+          message.vb4Qty = reader.double();
+          continue;
+        }
+        case 23: {
+          if (tag !== 185) {
+            break;
+          }
+
+          message.vb5Qty = reader.double();
+          continue;
+        }
+        case 24: {
+          if (tag !== 193) {
+            break;
+          }
+
+          message.mcPoyBobbinWeight = reader.double();
+          continue;
+        }
+        case 25: {
+          if (tag !== 201) {
+            break;
+          }
+
+          message.mcTotFxdCst = reader.double();
+          continue;
+        }
+        case 26: {
+          if (tag !== 209) {
+            break;
+          }
+
+          message.mcBobbinPerTrolly = reader.double();
+          continue;
+        }
+        case 27: {
+          if (tag !== 217) {
+            break;
+          }
+
+          message.mcBoxCost = reader.double();
+          continue;
+        }
+        case 28: {
+          if (tag !== 225) {
+            break;
+          }
+
+          message.mcCaptivePerBobbin = reader.double();
+          continue;
+        }
+        case 29: {
+          if (tag !== 233) {
+            break;
+          }
+
+          message.mcWeightage = reader.double();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Machine {
+    return {
+      machineId: isSet(object.machineId)
+        ? globalThis.String(object.machineId)
+        : isSet(object.machine_id)
+        ? globalThis.String(object.machine_id)
+        : "",
+      machineCode: isSet(object.machineCode)
+        ? globalThis.String(object.machineCode)
         : isSet(object.machine_code)
         ? globalThis.String(object.machine_code)
         : "",
@@ -1922,7 +2548,82 @@ export const Machine: MessageFns<Machine> = {
         ? globalThis.Boolean(object.is_active)
         : false,
       notes: isSet(object.notes) ? globalThis.String(object.notes) : "",
+      mpPerDay: isSet(object.mpPerDay)
+        ? globalThis.Number(object.mpPerDay)
+        : isSet(object.mp_per_day)
+        ? globalThis.Number(object.mp_per_day)
+        : undefined,
+      ohsPerDay: isSet(object.ohsPerDay)
+        ? globalThis.Number(object.ohsPerDay)
+        : isSet(object.ohs_per_day)
+        ? globalThis.Number(object.ohs_per_day)
+        : undefined,
       audit: isSet(object.audit) ? AuditInfo.fromJSON(object.audit) : undefined,
+      sparesPerDay: isSet(object.sparesPerDay)
+        ? globalThis.Number(object.sparesPerDay)
+        : isSet(object.spares_per_day)
+        ? globalThis.Number(object.spares_per_day)
+        : undefined,
+      kgsLostChange: isSet(object.kgsLostChange)
+        ? globalThis.Number(object.kgsLostChange)
+        : isSet(object.kgs_lost_change)
+        ? globalThis.Number(object.kgs_lost_change)
+        : undefined,
+      vb1Qty: isSet(object.vb1Qty)
+        ? globalThis.Number(object.vb1Qty)
+        : isSet(object.vb1_qty)
+        ? globalThis.Number(object.vb1_qty)
+        : undefined,
+      vb2Qty: isSet(object.vb2Qty)
+        ? globalThis.Number(object.vb2Qty)
+        : isSet(object.vb2_qty)
+        ? globalThis.Number(object.vb2_qty)
+        : undefined,
+      vb3Qty: isSet(object.vb3Qty)
+        ? globalThis.Number(object.vb3Qty)
+        : isSet(object.vb3_qty)
+        ? globalThis.Number(object.vb3_qty)
+        : undefined,
+      vb4Qty: isSet(object.vb4Qty)
+        ? globalThis.Number(object.vb4Qty)
+        : isSet(object.vb4_qty)
+        ? globalThis.Number(object.vb4_qty)
+        : undefined,
+      vb5Qty: isSet(object.vb5Qty)
+        ? globalThis.Number(object.vb5Qty)
+        : isSet(object.vb5_qty)
+        ? globalThis.Number(object.vb5_qty)
+        : undefined,
+      mcPoyBobbinWeight: isSet(object.mcPoyBobbinWeight)
+        ? globalThis.Number(object.mcPoyBobbinWeight)
+        : isSet(object.mc_poy_bobbin_weight)
+        ? globalThis.Number(object.mc_poy_bobbin_weight)
+        : undefined,
+      mcTotFxdCst: isSet(object.mcTotFxdCst)
+        ? globalThis.Number(object.mcTotFxdCst)
+        : isSet(object.mc_tot_fxd_cst)
+        ? globalThis.Number(object.mc_tot_fxd_cst)
+        : undefined,
+      mcBobbinPerTrolly: isSet(object.mcBobbinPerTrolly)
+        ? globalThis.Number(object.mcBobbinPerTrolly)
+        : isSet(object.mc_bobbin_per_trolly)
+        ? globalThis.Number(object.mc_bobbin_per_trolly)
+        : undefined,
+      mcBoxCost: isSet(object.mcBoxCost)
+        ? globalThis.Number(object.mcBoxCost)
+        : isSet(object.mc_box_cost)
+        ? globalThis.Number(object.mc_box_cost)
+        : undefined,
+      mcCaptivePerBobbin: isSet(object.mcCaptivePerBobbin)
+        ? globalThis.Number(object.mcCaptivePerBobbin)
+        : isSet(object.mc_captive_per_bobbin)
+        ? globalThis.Number(object.mc_captive_per_bobbin)
+        : undefined,
+      mcWeightage: isSet(object.mcWeightage)
+        ? globalThis.Number(object.mcWeightage)
+        : isSet(object.mc_weightage)
+        ? globalThis.Number(object.mc_weightage)
+        : undefined,
     };
   },
 
@@ -1967,9 +2668,54 @@ export const Machine: MessageFns<Machine> = {
     if (message.notes !== "") {
       obj.notes = message.notes;
     }
+    if (message.mpPerDay !== undefined) {
+      obj.mpPerDay = message.mpPerDay;
+    }
+    if (message.ohsPerDay !== undefined) {
+      obj.ohsPerDay = message.ohsPerDay;
+    }
     if (message.audit !== undefined) {
       obj.audit = AuditInfo.toJSON(message.audit);
     }
+    if (message.sparesPerDay !== undefined) {
+      obj.sparesPerDay = message.sparesPerDay;
+    }
+    if (message.kgsLostChange !== undefined) {
+      obj.kgsLostChange = message.kgsLostChange;
+    }
+    if (message.vb1Qty !== undefined) {
+      obj.vb1Qty = message.vb1Qty;
+    }
+    if (message.vb2Qty !== undefined) {
+      obj.vb2Qty = message.vb2Qty;
+    }
+    if (message.vb3Qty !== undefined) {
+      obj.vb3Qty = message.vb3Qty;
+    }
+    if (message.vb4Qty !== undefined) {
+      obj.vb4Qty = message.vb4Qty;
+    }
+    if (message.vb5Qty !== undefined) {
+      obj.vb5Qty = message.vb5Qty;
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      obj.mcPoyBobbinWeight = message.mcPoyBobbinWeight;
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      obj.mcTotFxdCst = message.mcTotFxdCst;
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      obj.mcBobbinPerTrolly = message.mcBobbinPerTrolly;
+    }
+    if (message.mcBoxCost !== undefined) {
+      obj.mcBoxCost = message.mcBoxCost;
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      obj.mcCaptivePerBobbin = message.mcCaptivePerBobbin;
+    }
+    if (message.mcWeightage !== undefined) {
+      obj.mcWeightage = message.mcWeightage;
+    }
     return obj;
   },
 
@@ -1991,9 +2737,24 @@ export const Machine: MessageFns<Machine> = {
     message.powerPerDay = object.powerPerDay ?? undefined;
     message.isActive = object.isActive ?? false;
     message.notes = object.notes ?? "";
+    message.mpPerDay = object.mpPerDay ?? undefined;
+    message.ohsPerDay = object.ohsPerDay ?? undefined;
     message.audit = (object.audit !== undefined && object.audit !== null)
       ? AuditInfo.fromPartial(object.audit)
       : undefined;
+    message.sparesPerDay = object.sparesPerDay ?? undefined;
+    message.kgsLostChange = object.kgsLostChange ?? undefined;
+    message.vb1Qty = object.vb1Qty ?? undefined;
+    message.vb2Qty = object.vb2Qty ?? undefined;
+    message.vb3Qty = object.vb3Qty ?? undefined;
+    message.vb4Qty = object.vb4Qty ?? undefined;
+    message.vb5Qty = object.vb5Qty ?? undefined;
+    message.mcPoyBobbinWeight = object.mcPoyBobbinWeight ?? undefined;
+    message.mcTotFxdCst = object.mcTotFxdCst ?? undefined;
+    message.mcBobbinPerTrolly = object.mcBobbinPerTrolly ?? undefined;
+    message.mcBoxCost = object.mcBoxCost ?? undefined;
+    message.mcCaptivePerBobbin = object.mcCaptivePerBobbin ?? undefined;
+    message.mcWeightage = object.mcWeightage ?? undefined;
     return message;
   },
 };
@@ -2011,6 +2772,21 @@ function createBaseCreateMachineRequest(): CreateMachineRequest {
     mcEfficiency: 0,
     powerPerDay: undefined,
     notes: "",
+    mpPerDay: undefined,
+    ohsPerDay: undefined,
+    sparesPerDay: undefined,
+    kgsLostChange: undefined,
+    vb1Qty: undefined,
+    vb2Qty: undefined,
+    vb3Qty: undefined,
+    vb4Qty: undefined,
+    vb5Qty: undefined,
+    mcPoyBobbinWeight: undefined,
+    mcTotFxdCst: undefined,
+    mcBobbinPerTrolly: undefined,
+    mcBoxCost: undefined,
+    mcCaptivePerBobbin: undefined,
+    mcWeightage: undefined,
   };
 }
 
@@ -2049,6 +2825,51 @@ export const CreateMachineRequest: MessageFns<CreateMachineRequest> = {
     if (message.notes !== "") {
       writer.uint32(90).string(message.notes);
     }
+    if (message.mpPerDay !== undefined) {
+      writer.uint32(97).double(message.mpPerDay);
+    }
+    if (message.ohsPerDay !== undefined) {
+      writer.uint32(105).double(message.ohsPerDay);
+    }
+    if (message.sparesPerDay !== undefined) {
+      writer.uint32(113).double(message.sparesPerDay);
+    }
+    if (message.kgsLostChange !== undefined) {
+      writer.uint32(121).double(message.kgsLostChange);
+    }
+    if (message.vb1Qty !== undefined) {
+      writer.uint32(129).double(message.vb1Qty);
+    }
+    if (message.vb2Qty !== undefined) {
+      writer.uint32(137).double(message.vb2Qty);
+    }
+    if (message.vb3Qty !== undefined) {
+      writer.uint32(145).double(message.vb3Qty);
+    }
+    if (message.vb4Qty !== undefined) {
+      writer.uint32(153).double(message.vb4Qty);
+    }
+    if (message.vb5Qty !== undefined) {
+      writer.uint32(161).double(message.vb5Qty);
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      writer.uint32(169).double(message.mcPoyBobbinWeight);
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      writer.uint32(177).double(message.mcTotFxdCst);
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      writer.uint32(185).double(message.mcBobbinPerTrolly);
+    }
+    if (message.mcBoxCost !== undefined) {
+      writer.uint32(193).double(message.mcBoxCost);
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      writer.uint32(201).double(message.mcCaptivePerBobbin);
+    }
+    if (message.mcWeightage !== undefined) {
+      writer.uint32(209).double(message.mcWeightage);
+    }
     return writer;
   },
 
@@ -2147,6 +2968,126 @@ export const CreateMachineRequest: MessageFns<CreateMachineRequest> = {
           message.notes = reader.string();
           continue;
         }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.mpPerDay = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.ohsPerDay = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 113) {
+            break;
+          }
+
+          message.sparesPerDay = reader.double();
+          continue;
+        }
+        case 15: {
+          if (tag !== 121) {
+            break;
+          }
+
+          message.kgsLostChange = reader.double();
+          continue;
+        }
+        case 16: {
+          if (tag !== 129) {
+            break;
+          }
+
+          message.vb1Qty = reader.double();
+          continue;
+        }
+        case 17: {
+          if (tag !== 137) {
+            break;
+          }
+
+          message.vb2Qty = reader.double();
+          continue;
+        }
+        case 18: {
+          if (tag !== 145) {
+            break;
+          }
+
+          message.vb3Qty = reader.double();
+          continue;
+        }
+        case 19: {
+          if (tag !== 153) {
+            break;
+          }
+
+          message.vb4Qty = reader.double();
+          continue;
+        }
+        case 20: {
+          if (tag !== 161) {
+            break;
+          }
+
+          message.vb5Qty = reader.double();
+          continue;
+        }
+        case 21: {
+          if (tag !== 169) {
+            break;
+          }
+
+          message.mcPoyBobbinWeight = reader.double();
+          continue;
+        }
+        case 22: {
+          if (tag !== 177) {
+            break;
+          }
+
+          message.mcTotFxdCst = reader.double();
+          continue;
+        }
+        case 23: {
+          if (tag !== 185) {
+            break;
+          }
+
+          message.mcBobbinPerTrolly = reader.double();
+          continue;
+        }
+        case 24: {
+          if (tag !== 193) {
+            break;
+          }
+
+          message.mcBoxCost = reader.double();
+          continue;
+        }
+        case 25: {
+          if (tag !== 201) {
+            break;
+          }
+
+          message.mcCaptivePerBobbin = reader.double();
+          continue;
+        }
+        case 26: {
+          if (tag !== 209) {
+            break;
+          }
+
+          message.mcWeightage = reader.double();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -2209,6 +3150,81 @@ export const CreateMachineRequest: MessageFns<CreateMachineRequest> = {
         ? globalThis.Number(object.power_per_day)
         : undefined,
       notes: isSet(object.notes) ? globalThis.String(object.notes) : "",
+      mpPerDay: isSet(object.mpPerDay)
+        ? globalThis.Number(object.mpPerDay)
+        : isSet(object.mp_per_day)
+        ? globalThis.Number(object.mp_per_day)
+        : undefined,
+      ohsPerDay: isSet(object.ohsPerDay)
+        ? globalThis.Number(object.ohsPerDay)
+        : isSet(object.ohs_per_day)
+        ? globalThis.Number(object.ohs_per_day)
+        : undefined,
+      sparesPerDay: isSet(object.sparesPerDay)
+        ? globalThis.Number(object.sparesPerDay)
+        : isSet(object.spares_per_day)
+        ? globalThis.Number(object.spares_per_day)
+        : undefined,
+      kgsLostChange: isSet(object.kgsLostChange)
+        ? globalThis.Number(object.kgsLostChange)
+        : isSet(object.kgs_lost_change)
+        ? globalThis.Number(object.kgs_lost_change)
+        : undefined,
+      vb1Qty: isSet(object.vb1Qty)
+        ? globalThis.Number(object.vb1Qty)
+        : isSet(object.vb1_qty)
+        ? globalThis.Number(object.vb1_qty)
+        : undefined,
+      vb2Qty: isSet(object.vb2Qty)
+        ? globalThis.Number(object.vb2Qty)
+        : isSet(object.vb2_qty)
+        ? globalThis.Number(object.vb2_qty)
+        : undefined,
+      vb3Qty: isSet(object.vb3Qty)
+        ? globalThis.Number(object.vb3Qty)
+        : isSet(object.vb3_qty)
+        ? globalThis.Number(object.vb3_qty)
+        : undefined,
+      vb4Qty: isSet(object.vb4Qty)
+        ? globalThis.Number(object.vb4Qty)
+        : isSet(object.vb4_qty)
+        ? globalThis.Number(object.vb4_qty)
+        : undefined,
+      vb5Qty: isSet(object.vb5Qty)
+        ? globalThis.Number(object.vb5Qty)
+        : isSet(object.vb5_qty)
+        ? globalThis.Number(object.vb5_qty)
+        : undefined,
+      mcPoyBobbinWeight: isSet(object.mcPoyBobbinWeight)
+        ? globalThis.Number(object.mcPoyBobbinWeight)
+        : isSet(object.mc_poy_bobbin_weight)
+        ? globalThis.Number(object.mc_poy_bobbin_weight)
+        : undefined,
+      mcTotFxdCst: isSet(object.mcTotFxdCst)
+        ? globalThis.Number(object.mcTotFxdCst)
+        : isSet(object.mc_tot_fxd_cst)
+        ? globalThis.Number(object.mc_tot_fxd_cst)
+        : undefined,
+      mcBobbinPerTrolly: isSet(object.mcBobbinPerTrolly)
+        ? globalThis.Number(object.mcBobbinPerTrolly)
+        : isSet(object.mc_bobbin_per_trolly)
+        ? globalThis.Number(object.mc_bobbin_per_trolly)
+        : undefined,
+      mcBoxCost: isSet(object.mcBoxCost)
+        ? globalThis.Number(object.mcBoxCost)
+        : isSet(object.mc_box_cost)
+        ? globalThis.Number(object.mc_box_cost)
+        : undefined,
+      mcCaptivePerBobbin: isSet(object.mcCaptivePerBobbin)
+        ? globalThis.Number(object.mcCaptivePerBobbin)
+        : isSet(object.mc_captive_per_bobbin)
+        ? globalThis.Number(object.mc_captive_per_bobbin)
+        : undefined,
+      mcWeightage: isSet(object.mcWeightage)
+        ? globalThis.Number(object.mcWeightage)
+        : isSet(object.mc_weightage)
+        ? globalThis.Number(object.mc_weightage)
+        : undefined,
     };
   },
 
@@ -2247,6 +3263,51 @@ export const CreateMachineRequest: MessageFns<CreateMachineRequest> = {
     if (message.notes !== "") {
       obj.notes = message.notes;
     }
+    if (message.mpPerDay !== undefined) {
+      obj.mpPerDay = message.mpPerDay;
+    }
+    if (message.ohsPerDay !== undefined) {
+      obj.ohsPerDay = message.ohsPerDay;
+    }
+    if (message.sparesPerDay !== undefined) {
+      obj.sparesPerDay = message.sparesPerDay;
+    }
+    if (message.kgsLostChange !== undefined) {
+      obj.kgsLostChange = message.kgsLostChange;
+    }
+    if (message.vb1Qty !== undefined) {
+      obj.vb1Qty = message.vb1Qty;
+    }
+    if (message.vb2Qty !== undefined) {
+      obj.vb2Qty = message.vb2Qty;
+    }
+    if (message.vb3Qty !== undefined) {
+      obj.vb3Qty = message.vb3Qty;
+    }
+    if (message.vb4Qty !== undefined) {
+      obj.vb4Qty = message.vb4Qty;
+    }
+    if (message.vb5Qty !== undefined) {
+      obj.vb5Qty = message.vb5Qty;
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      obj.mcPoyBobbinWeight = message.mcPoyBobbinWeight;
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      obj.mcTotFxdCst = message.mcTotFxdCst;
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      obj.mcBobbinPerTrolly = message.mcBobbinPerTrolly;
+    }
+    if (message.mcBoxCost !== undefined) {
+      obj.mcBoxCost = message.mcBoxCost;
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      obj.mcCaptivePerBobbin = message.mcCaptivePerBobbin;
+    }
+    if (message.mcWeightage !== undefined) {
+      obj.mcWeightage = message.mcWeightage;
+    }
     return obj;
   },
 
@@ -2266,6 +3327,21 @@ export const CreateMachineRequest: MessageFns<CreateMachineRequest> = {
     message.mcEfficiency = object.mcEfficiency ?? 0;
     message.powerPerDay = object.powerPerDay ?? undefined;
     message.notes = object.notes ?? "";
+    message.mpPerDay = object.mpPerDay ?? undefined;
+    message.ohsPerDay = object.ohsPerDay ?? undefined;
+    message.sparesPerDay = object.sparesPerDay ?? undefined;
+    message.kgsLostChange = object.kgsLostChange ?? undefined;
+    message.vb1Qty = object.vb1Qty ?? undefined;
+    message.vb2Qty = object.vb2Qty ?? undefined;
+    message.vb3Qty = object.vb3Qty ?? undefined;
+    message.vb4Qty = object.vb4Qty ?? undefined;
+    message.vb5Qty = object.vb5Qty ?? undefined;
+    message.mcPoyBobbinWeight = object.mcPoyBobbinWeight ?? undefined;
+    message.mcTotFxdCst = object.mcTotFxdCst ?? undefined;
+    message.mcBobbinPerTrolly = object.mcBobbinPerTrolly ?? undefined;
+    message.mcBoxCost = object.mcBoxCost ?? undefined;
+    message.mcCaptivePerBobbin = object.mcCaptivePerBobbin ?? undefined;
+    message.mcWeightage = object.mcWeightage ?? undefined;
     return message;
   },
 };
@@ -2504,6 +3580,21 @@ function createBaseUpdateMachineRequest(): UpdateMachineRequest {
     powerPerDay: undefined,
     notes: undefined,
     isActive: undefined,
+    mpPerDay: undefined,
+    ohsPerDay: undefined,
+    sparesPerDay: undefined,
+    kgsLostChange: undefined,
+    vb1Qty: undefined,
+    vb2Qty: undefined,
+    vb3Qty: undefined,
+    vb4Qty: undefined,
+    vb5Qty: undefined,
+    mcPoyBobbinWeight: undefined,
+    mcTotFxdCst: undefined,
+    mcBobbinPerTrolly: undefined,
+    mcBoxCost: undefined,
+    mcCaptivePerBobbin: undefined,
+    mcWeightage: undefined,
   };
 }
 
@@ -2545,6 +3636,51 @@ export const UpdateMachineRequest: MessageFns<UpdateMachineRequest> = {
     if (message.isActive !== undefined) {
       writer.uint32(96).bool(message.isActive);
     }
+    if (message.mpPerDay !== undefined) {
+      writer.uint32(105).double(message.mpPerDay);
+    }
+    if (message.ohsPerDay !== undefined) {
+      writer.uint32(113).double(message.ohsPerDay);
+    }
+    if (message.sparesPerDay !== undefined) {
+      writer.uint32(121).double(message.sparesPerDay);
+    }
+    if (message.kgsLostChange !== undefined) {
+      writer.uint32(129).double(message.kgsLostChange);
+    }
+    if (message.vb1Qty !== undefined) {
+      writer.uint32(137).double(message.vb1Qty);
+    }
+    if (message.vb2Qty !== undefined) {
+      writer.uint32(145).double(message.vb2Qty);
+    }
+    if (message.vb3Qty !== undefined) {
+      writer.uint32(153).double(message.vb3Qty);
+    }
+    if (message.vb4Qty !== undefined) {
+      writer.uint32(161).double(message.vb4Qty);
+    }
+    if (message.vb5Qty !== undefined) {
+      writer.uint32(169).double(message.vb5Qty);
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      writer.uint32(177).double(message.mcPoyBobbinWeight);
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      writer.uint32(185).double(message.mcTotFxdCst);
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      writer.uint32(193).double(message.mcBobbinPerTrolly);
+    }
+    if (message.mcBoxCost !== undefined) {
+      writer.uint32(201).double(message.mcBoxCost);
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      writer.uint32(209).double(message.mcCaptivePerBobbin);
+    }
+    if (message.mcWeightage !== undefined) {
+      writer.uint32(217).double(message.mcWeightage);
+    }
     return writer;
   },
 
@@ -2648,7 +3784,127 @@ export const UpdateMachineRequest: MessageFns<UpdateMachineRequest> = {
             break;
           }
 
-          message.isActive = reader.bool();
+          message.isActive = reader.bool();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.mpPerDay = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 113) {
+            break;
+          }
+
+          message.ohsPerDay = reader.double();
+          continue;
+        }
+        case 15: {
+          if (tag !== 121) {
+            break;
+          }
+
+          message.sparesPerDay = reader.double();
+          continue;
+        }
+        case 16: {
+          if (tag !== 129) {
+            break;
+          }
+
+          message.kgsLostChange = reader.double();
+          continue;
+        }
+        case 17: {
+          if (tag !== 137) {
+            break;
+          }
+
+          message.vb1Qty = reader.double();
+          continue;
+        }
+        case 18: {
+          if (tag !== 145) {
+            break;
+          }
+
+          message.vb2Qty = reader.double();
+          continue;
+        }
+        case 19: {
+          if (tag !== 153) {
+            break;
+          }
+
+          message.vb3Qty = reader.double();
+          continue;
+        }
+        case 20: {
+          if (tag !== 161) {
+            break;
+          }
+
+          message.vb4Qty = reader.double();
+          continue;
+        }
+        case 21: {
+          if (tag !== 169) {
+            break;
+          }
+
+          message.vb5Qty = reader.double();
+          continue;
+        }
+        case 22: {
+          if (tag !== 177) {
+            break;
+          }
+
+          message.mcPoyBobbinWeight = reader.double();
+          continue;
+        }
+        case 23: {
+          if (tag !== 185) {
+            break;
+          }
+
+          message.mcTotFxdCst = reader.double();
+          continue;
+        }
+        case 24: {
+          if (tag !== 193) {
+            break;
+          }
+
+          message.mcBobbinPerTrolly = reader.double();
+          continue;
+        }
+        case 25: {
+          if (tag !== 201) {
+            break;
+          }
+
+          message.mcBoxCost = reader.double();
+          continue;
+        }
+        case 26: {
+          if (tag !== 209) {
+            break;
+          }
+
+          message.mcCaptivePerBobbin = reader.double();
+          continue;
+        }
+        case 27: {
+          if (tag !== 217) {
+            break;
+          }
+
+          message.mcWeightage = reader.double();
           continue;
         }
       }
@@ -2718,6 +3974,81 @@ export const UpdateMachineRequest: MessageFns<UpdateMachineRequest> = {
         : isSet(object.is_active)
         ? globalThis.Boolean(object.is_active)
         : undefined,
+      mpPerDay: isSet(object.mpPerDay)
+        ? globalThis.Number(object.mpPerDay)
+        : isSet(object.mp_per_day)
+        ? globalThis.Number(object.mp_per_day)
+        : undefined,
+      ohsPerDay: isSet(object.ohsPerDay)
+        ? globalThis.Number(object.ohsPerDay)
+        : isSet(object.ohs_per_day)
+        ? globalThis.Number(object.ohs_per_day)
+        : undefined,
+      sparesPerDay: isSet(object.sparesPerDay)
+        ? globalThis.Number(object.sparesPerDay)
+        : isSet(object.spares_per_day)
+        ? globalThis.Number(object.spares_per_day)
+        : undefined,
+      kgsLostChange: isSet(object.kgsLostChange)
+        ? globalThis.Number(object.kgsLostChange)
+        : isSet(object.kgs_lost_change)
+        ? globalThis.Number(object.kgs_lost_change)
+        : undefined,
+      vb1Qty: isSet(object.vb1Qty)
+        ? globalThis.Number(object.vb1Qty)
+        : isSet(object.vb1_qty)
+        ? globalThis.Number(object.vb1_qty)
+        : undefined,
+      vb2Qty: isSet(object.vb2Qty)
+        ? globalThis.Number(object.vb2Qty)
+        : isSet(object.vb2_qty)
+        ? globalThis.Number(object.vb2_qty)
+        : undefined,
+      vb3Qty: isSet(object.vb3Qty)
+        ? globalThis.Number(object.vb3Qty)
+        : isSet(object.vb3_qty)
+        ? globalThis.Number(object.vb3_qty)
+        : undefined,
+      vb4Qty: isSet(object.vb4Qty)
+        ? globalThis.Number(object.vb4Qty)
+        : isSet(object.vb4_qty)
+        ? globalThis.Number(object.vb4_qty)
+        : undefined,
+      vb5Qty: isSet(object.vb5Qty)
+        ? globalThis.Number(object.vb5Qty)
+        : isSet(object.vb5_qty)
+        ? globalThis.Number(object.vb5_qty)
+        : undefined,
+      mcPoyBobbinWeight: isSet(object.mcPoyBobbinWeight)
+        ? globalThis.Number(object.mcPoyBobbinWeight)
+        : isSet(object.mc_poy_bobbin_weight)
+        ? globalThis.Number(object.mc_poy_bobbin_weight)
+        : undefined,
+      mcTotFxdCst: isSet(object.mcTotFxdCst)
+        ? globalThis.Number(object.mcTotFxdCst)
+        : isSet(object.mc_tot_fxd_cst)
+        ? globalThis.Number(object.mc_tot_fxd_cst)
+        : undefined,
+      mcBobbinPerTrolly: isSet(object.mcBobbinPerTrolly)
+        ? globalThis.Number(object.mcBobbinPerTrolly)
+        : isSet(object.mc_bobbin_per_trolly)
+        ? globalThis.Number(object.mc_bobbin_per_trolly)
+        : undefined,
+      mcBoxCost: isSet(object.mcBoxCost)
+        ? globalThis.Number(object.mcBoxCost)
+        : isSet(object.mc_box_cost)
+        ? globalThis.Number(object.mc_box_cost)
+        : undefined,
+      mcCaptivePerBobbin: isSet(object.mcCaptivePerBobbin)
+        ? globalThis.Number(object.mcCaptivePerBobbin)
+        : isSet(object.mc_captive_per_bobbin)
+        ? globalThis.Number(object.mc_captive_per_bobbin)
+        : undefined,
+      mcWeightage: isSet(object.mcWeightage)
+        ? globalThis.Number(object.mcWeightage)
+        : isSet(object.mc_weightage)
+        ? globalThis.Number(object.mc_weightage)
+        : undefined,
     };
   },
 
@@ -2759,6 +4090,51 @@ export const UpdateMachineRequest: MessageFns<UpdateMachineRequest> = {
     if (message.isActive !== undefined) {
       obj.isActive = message.isActive;
     }
+    if (message.mpPerDay !== undefined) {
+      obj.mpPerDay = message.mpPerDay;
+    }
+    if (message.ohsPerDay !== undefined) {
+      obj.ohsPerDay = message.ohsPerDay;
+    }
+    if (message.sparesPerDay !== undefined) {
+      obj.sparesPerDay = message.sparesPerDay;
+    }
+    if (message.kgsLostChange !== undefined) {
+      obj.kgsLostChange = message.kgsLostChange;
+    }
+    if (message.vb1Qty !== undefined) {
+      obj.vb1Qty = message.vb1Qty;
+    }
+    if (message.vb2Qty !== undefined) {
+      obj.vb2Qty = message.vb2Qty;
+    }
+    if (message.vb3Qty !== undefined) {
+      obj.vb3Qty = message.vb3Qty;
+    }
+    if (message.vb4Qty !== undefined) {
+      obj.vb4Qty = message.vb4Qty;
+    }
+    if (message.vb5Qty !== undefined) {
+      obj.vb5Qty = message.vb5Qty;
+    }
+    if (message.mcPoyBobbinWeight !== undefined) {
+      obj.mcPoyBobbinWeight = message.mcPoyBobbinWeight;
+    }
+    if (message.mcTotFxdCst !== undefined) {
+      obj.mcTotFxdCst = message.mcTotFxdCst;
+    }
+    if (message.mcBobbinPerTrolly !== undefined) {
+      obj.mcBobbinPerTrolly = message.mcBobbinPerTrolly;
+    }
+    if (message.mcBoxCost !== undefined) {
+      obj.mcBoxCost = message.mcBoxCost;
+    }
+    if (message.mcCaptivePerBobbin !== undefined) {
+      obj.mcCaptivePerBobbin = message.mcCaptivePerBobbin;
+    }
+    if (message.mcWeightage !== undefined) {
+      obj.mcWeightage = message.mcWeightage;
+    }
     return obj;
   },
 
@@ -2779,6 +4155,21 @@ export const UpdateMachineRequest: MessageFns<UpdateMachineRequest> = {
     message.powerPerDay = object.powerPerDay ?? undefined;
     message.notes = object.notes ?? undefined;
     message.isActive = object.isActive ?? undefined;
+    message.mpPerDay = object.mpPerDay ?? undefined;
+    message.ohsPerDay = object.ohsPerDay ?? undefined;
+    message.sparesPerDay = object.sparesPerDay ?? undefined;
+    message.kgsLostChange = object.kgsLostChange ?? undefined;
+    message.vb1Qty = object.vb1Qty ?? undefined;
+    message.vb2Qty = object.vb2Qty ?? undefined;
+    message.vb3Qty = object.vb3Qty ?? undefined;
+    message.vb4Qty = object.vb4Qty ?? undefined;
+    message.vb5Qty = object.vb5Qty ?? undefined;
+    message.mcPoyBobbinWeight = object.mcPoyBobbinWeight ?? undefined;
+    message.mcTotFxdCst = object.mcTotFxdCst ?? undefined;
+    message.mcBobbinPerTrolly = object.mcBobbinPerTrolly ?? undefined;
+    message.mcBoxCost = object.mcBoxCost ?? undefined;
+    message.mcCaptivePerBobbin = object.mcCaptivePerBobbin ?? undefined;
+    message.mcWeightage = object.mcWeightage ?? undefined;
     return message;
   },
 };
@@ -4031,7 +5422,15 @@ function createBaseBoxBobbinCost(): BoxBobbinCost {
     isActive: false,
     notes: "",
     rates: [],
+    bbnReuse: undefined,
+    boxReuse: undefined,
+    boxCost: undefined,
+    bobinCost: undefined,
+    boxCostVal: undefined,
+    bobinCostVal: undefined,
+    bbnReuseVal: undefined,
     audit: undefined,
+    boxReuseVal: undefined,
   };
 }
 
@@ -4061,9 +5460,33 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
     for (const v of message.rates) {
       BoxBobbinCostRate.encode(v!, writer.uint32(66).fork()).join();
     }
+    if (message.bbnReuse !== undefined) {
+      writer.uint32(73).double(message.bbnReuse);
+    }
+    if (message.boxReuse !== undefined) {
+      writer.uint32(81).double(message.boxReuse);
+    }
+    if (message.boxCost !== undefined) {
+      writer.uint32(89).double(message.boxCost);
+    }
+    if (message.bobinCost !== undefined) {
+      writer.uint32(97).double(message.bobinCost);
+    }
+    if (message.boxCostVal !== undefined) {
+      writer.uint32(105).double(message.boxCostVal);
+    }
+    if (message.bobinCostVal !== undefined) {
+      writer.uint32(113).double(message.bobinCostVal);
+    }
+    if (message.bbnReuseVal !== undefined) {
+      writer.uint32(121).double(message.bbnReuseVal);
+    }
     if (message.audit !== undefined) {
       AuditInfo.encode(message.audit, writer.uint32(130).fork()).join();
     }
+    if (message.boxReuseVal !== undefined) {
+      writer.uint32(137).double(message.boxReuseVal);
+    }
     return writer;
   },
 
@@ -4138,6 +5561,62 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
           message.rates.push(BoxBobbinCostRate.decode(reader, reader.uint32()));
           continue;
         }
+        case 9: {
+          if (tag !== 73) {
+            break;
+          }
+
+          message.bbnReuse = reader.double();
+          continue;
+        }
+        case 10: {
+          if (tag !== 81) {
+            break;
+          }
+
+          message.boxReuse = reader.double();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.boxCost = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.bobinCost = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.boxCostVal = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 113) {
+            break;
+          }
+
+          message.bobinCostVal = reader.double();
+          continue;
+        }
+        case 15: {
+          if (tag !== 121) {
+            break;
+          }
+
+          message.bbnReuseVal = reader.double();
+          continue;
+        }
         case 16: {
           if (tag !== 130) {
             break;
@@ -4146,6 +5625,14 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
           message.audit = AuditInfo.decode(reader, reader.uint32());
           continue;
         }
+        case 17: {
+          if (tag !== 137) {
+            break;
+          }
+
+          message.boxReuseVal = reader.double();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -4191,7 +5678,47 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
       rates: globalThis.Array.isArray(object?.rates)
         ? object.rates.map((e: any) => BoxBobbinCostRate.fromJSON(e))
         : [],
+      bbnReuse: isSet(object.bbnReuse)
+        ? globalThis.Number(object.bbnReuse)
+        : isSet(object.bbn_reuse)
+        ? globalThis.Number(object.bbn_reuse)
+        : undefined,
+      boxReuse: isSet(object.boxReuse)
+        ? globalThis.Number(object.boxReuse)
+        : isSet(object.box_reuse)
+        ? globalThis.Number(object.box_reuse)
+        : undefined,
+      boxCost: isSet(object.boxCost)
+        ? globalThis.Number(object.boxCost)
+        : isSet(object.box_cost)
+        ? globalThis.Number(object.box_cost)
+        : undefined,
+      bobinCost: isSet(object.bobinCost)
+        ? globalThis.Number(object.bobinCost)
+        : isSet(object.bobin_cost)
+        ? globalThis.Number(object.bobin_cost)
+        : undefined,
+      boxCostVal: isSet(object.boxCostVal)
+        ? globalThis.Number(object.boxCostVal)
+        : isSet(object.box_cost_val)
+        ? globalThis.Number(object.box_cost_val)
+        : undefined,
+      bobinCostVal: isSet(object.bobinCostVal)
+        ? globalThis.Number(object.bobinCostVal)
+        : isSet(object.bobin_cost_val)
+        ? globalThis.Number(object.bobin_cost_val)
+        : undefined,
+      bbnReuseVal: isSet(object.bbnReuseVal)
+        ? globalThis.Number(object.bbnReuseVal)
+        : isSet(object.bbn_reuse_val)
+        ? globalThis.Number(object.bbn_reuse_val)
+        : undefined,
       audit: isSet(object.audit) ? AuditInfo.fromJSON(object.audit) : undefined,
+      boxReuseVal: isSet(object.boxReuseVal)
+        ? globalThis.Number(object.boxReuseVal)
+        : isSet(object.box_reuse_val)
+        ? globalThis.Number(object.box_reuse_val)
+        : undefined,
     };
   },
 
@@ -4221,9 +5748,33 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
     if (message.rates?.length) {
       obj.rates = message.rates.map((e) => BoxBobbinCostRate.toJSON(e));
     }
+    if (message.bbnReuse !== undefined) {
+      obj.bbnReuse = message.bbnReuse;
+    }
+    if (message.boxReuse !== undefined) {
+      obj.boxReuse = message.boxReuse;
+    }
+    if (message.boxCost !== undefined) {
+      obj.boxCost = message.boxCost;
+    }
+    if (message.bobinCost !== undefined) {
+      obj.bobinCost = message.bobinCost;
+    }
+    if (message.boxCostVal !== undefined) {
+      obj.boxCostVal = message.boxCostVal;
+    }
+    if (message.bobinCostVal !== undefined) {
+      obj.bobinCostVal = message.bobinCostVal;
+    }
+    if (message.bbnReuseVal !== undefined) {
+      obj.bbnReuseVal = message.bbnReuseVal;
+    }
     if (message.audit !== undefined) {
       obj.audit = AuditInfo.toJSON(message.audit);
     }
+    if (message.boxReuseVal !== undefined) {
+      obj.boxReuseVal = message.boxReuseVal;
+    }
     return obj;
   },
 
@@ -4240,15 +5791,37 @@ export const BoxBobbinCost: MessageFns<BoxBobbinCost> = {
     message.isActive = object.isActive ?? false;
     message.notes = object.notes ?? "";
     message.rates = object.rates?.map((e) => BoxBobbinCostRate.fromPartial(e)) || [];
+    message.bbnReuse = object.bbnReuse ?? undefined;
+    message.boxReuse = object.boxReuse ?? undefined;
+    message.boxCost = object.boxCost ?? undefined;
+    message.bobinCost = object.bobinCost ?? undefined;
+    message.boxCostVal = object.boxCostVal ?? undefined;
+    message.bobinCostVal = object.bobinCostVal ?? undefined;
+    message.bbnReuseVal = object.bbnReuseVal ?? undefined;
     message.audit = (object.audit !== undefined && object.audit !== null)
       ? AuditInfo.fromPartial(object.audit)
       : undefined;
+    message.boxReuseVal = object.boxReuseVal ?? undefined;
     return message;
   },
 };
 
 function createBaseCreateBoxBobbinCostRequest(): CreateBoxBobbinCostRequest {
-  return { bbcCode: "", bbcName: "", bbcType: "", noOfBob: 0, notes: "" };
+  return {
+    bbcCode: "",
+    bbcName: "",
+    bbcType: "",
+    noOfBob: 0,
+    notes: "",
+    bbnReuse: undefined,
+    boxReuse: undefined,
+    boxCost: undefined,
+    bobinCost: undefined,
+    boxCostVal: undefined,
+    bobinCostVal: undefined,
+    bbnReuseVal: undefined,
+    boxReuseVal: undefined,
+  };
 }
 
 export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest> = {
@@ -4268,6 +5841,30 @@ export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest>
     if (message.notes !== "") {
       writer.uint32(42).string(message.notes);
     }
+    if (message.bbnReuse !== undefined) {
+      writer.uint32(49).double(message.bbnReuse);
+    }
+    if (message.boxReuse !== undefined) {
+      writer.uint32(57).double(message.boxReuse);
+    }
+    if (message.boxCost !== undefined) {
+      writer.uint32(65).double(message.boxCost);
+    }
+    if (message.bobinCost !== undefined) {
+      writer.uint32(73).double(message.bobinCost);
+    }
+    if (message.boxCostVal !== undefined) {
+      writer.uint32(81).double(message.boxCostVal);
+    }
+    if (message.bobinCostVal !== undefined) {
+      writer.uint32(89).double(message.bobinCostVal);
+    }
+    if (message.bbnReuseVal !== undefined) {
+      writer.uint32(97).double(message.bbnReuseVal);
+    }
+    if (message.boxReuseVal !== undefined) {
+      writer.uint32(105).double(message.boxReuseVal);
+    }
     return writer;
   },
 
@@ -4318,6 +5915,70 @@ export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest>
           message.notes = reader.string();
           continue;
         }
+        case 6: {
+          if (tag !== 49) {
+            break;
+          }
+
+          message.bbnReuse = reader.double();
+          continue;
+        }
+        case 7: {
+          if (tag !== 57) {
+            break;
+          }
+
+          message.boxReuse = reader.double();
+          continue;
+        }
+        case 8: {
+          if (tag !== 65) {
+            break;
+          }
+
+          message.boxCost = reader.double();
+          continue;
+        }
+        case 9: {
+          if (tag !== 73) {
+            break;
+          }
+
+          message.bobinCost = reader.double();
+          continue;
+        }
+        case 10: {
+          if (tag !== 81) {
+            break;
+          }
+
+          message.boxCostVal = reader.double();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.bobinCostVal = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.bbnReuseVal = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.boxReuseVal = reader.double();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -4350,6 +6011,46 @@ export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest>
         ? globalThis.Number(object.no_of_bob)
         : 0,
       notes: isSet(object.notes) ? globalThis.String(object.notes) : "",
+      bbnReuse: isSet(object.bbnReuse)
+        ? globalThis.Number(object.bbnReuse)
+        : isSet(object.bbn_reuse)
+        ? globalThis.Number(object.bbn_reuse)
+        : undefined,
+      boxReuse: isSet(object.boxReuse)
+        ? globalThis.Number(object.boxReuse)
+        : isSet(object.box_reuse)
+        ? globalThis.Number(object.box_reuse)
+        : undefined,
+      boxCost: isSet(object.boxCost)
+        ? globalThis.Number(object.boxCost)
+        : isSet(object.box_cost)
+        ? globalThis.Number(object.box_cost)
+        : undefined,
+      bobinCost: isSet(object.bobinCost)
+        ? globalThis.Number(object.bobinCost)
+        : isSet(object.bobin_cost)
+        ? globalThis.Number(object.bobin_cost)
+        : undefined,
+      boxCostVal: isSet(object.boxCostVal)
+        ? globalThis.Number(object.boxCostVal)
+        : isSet(object.box_cost_val)
+        ? globalThis.Number(object.box_cost_val)
+        : undefined,
+      bobinCostVal: isSet(object.bobinCostVal)
+        ? globalThis.Number(object.bobinCostVal)
+        : isSet(object.bobin_cost_val)
+        ? globalThis.Number(object.bobin_cost_val)
+        : undefined,
+      bbnReuseVal: isSet(object.bbnReuseVal)
+        ? globalThis.Number(object.bbnReuseVal)
+        : isSet(object.bbn_reuse_val)
+        ? globalThis.Number(object.bbn_reuse_val)
+        : undefined,
+      boxReuseVal: isSet(object.boxReuseVal)
+        ? globalThis.Number(object.boxReuseVal)
+        : isSet(object.box_reuse_val)
+        ? globalThis.Number(object.box_reuse_val)
+        : undefined,
     };
   },
 
@@ -4370,6 +6071,30 @@ export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest>
     if (message.notes !== "") {
       obj.notes = message.notes;
     }
+    if (message.bbnReuse !== undefined) {
+      obj.bbnReuse = message.bbnReuse;
+    }
+    if (message.boxReuse !== undefined) {
+      obj.boxReuse = message.boxReuse;
+    }
+    if (message.boxCost !== undefined) {
+      obj.boxCost = message.boxCost;
+    }
+    if (message.bobinCost !== undefined) {
+      obj.bobinCost = message.bobinCost;
+    }
+    if (message.boxCostVal !== undefined) {
+      obj.boxCostVal = message.boxCostVal;
+    }
+    if (message.bobinCostVal !== undefined) {
+      obj.bobinCostVal = message.bobinCostVal;
+    }
+    if (message.bbnReuseVal !== undefined) {
+      obj.bbnReuseVal = message.bbnReuseVal;
+    }
+    if (message.boxReuseVal !== undefined) {
+      obj.boxReuseVal = message.boxReuseVal;
+    }
     return obj;
   },
 
@@ -4383,6 +6108,14 @@ export const CreateBoxBobbinCostRequest: MessageFns<CreateBoxBobbinCostRequest>
     message.bbcType = object.bbcType ?? "";
     message.noOfBob = object.noOfBob ?? 0;
     message.notes = object.notes ?? "";
+    message.bbnReuse = object.bbnReuse ?? undefined;
+    message.boxReuse = object.boxReuse ?? undefined;
+    message.boxCost = object.boxCost ?? undefined;
+    message.bobinCost = object.bobinCost ?? undefined;
+    message.boxCostVal = object.boxCostVal ?? undefined;
+    message.bobinCostVal = object.bobinCostVal ?? undefined;
+    message.bbnReuseVal = object.bbnReuseVal ?? undefined;
+    message.boxReuseVal = object.boxReuseVal ?? undefined;
     return message;
   },
 };
@@ -4619,6 +6352,14 @@ function createBaseUpdateBoxBobbinCostRequest(): UpdateBoxBobbinCostRequest {
     noOfBob: undefined,
     notes: undefined,
     isActive: undefined,
+    bbnReuse: undefined,
+    boxReuse: undefined,
+    boxCost: undefined,
+    bobinCost: undefined,
+    boxCostVal: undefined,
+    bobinCostVal: undefined,
+    bbnReuseVal: undefined,
+    boxReuseVal: undefined,
   };
 }
 
@@ -4642,6 +6383,30 @@ export const UpdateBoxBobbinCostRequest: MessageFns<UpdateBoxBobbinCostRequest>
     if (message.isActive !== undefined) {
       writer.uint32(48).bool(message.isActive);
     }
+    if (message.bbnReuse !== undefined) {
+      writer.uint32(57).double(message.bbnReuse);
+    }
+    if (message.boxReuse !== undefined) {
+      writer.uint32(65).double(message.boxReuse);
+    }
+    if (message.boxCost !== undefined) {
+      writer.uint32(73).double(message.boxCost);
+    }
+    if (message.bobinCost !== undefined) {
+      writer.uint32(81).double(message.bobinCost);
+    }
+    if (message.boxCostVal !== undefined) {
+      writer.uint32(89).double(message.boxCostVal);
+    }
+    if (message.bobinCostVal !== undefined) {
+      writer.uint32(97).double(message.bobinCostVal);
+    }
+    if (message.bbnReuseVal !== undefined) {
+      writer.uint32(105).double(message.bbnReuseVal);
+    }
+    if (message.boxReuseVal !== undefined) {
+      writer.uint32(113).double(message.boxReuseVal);
+    }
     return writer;
   },
 
@@ -4657,47 +6422,111 @@ export const UpdateBoxBobbinCostRequest: MessageFns<UpdateBoxBobbinCostRequest>
             break;
           }
 
-          message.bbcId = reader.string();
+          message.bbcId = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.bbcName = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.bbcType = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+
+          message.noOfBob = reader.int32();
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+
+          message.notes = reader.string();
+          continue;
+        }
+        case 6: {
+          if (tag !== 48) {
+            break;
+          }
+
+          message.isActive = reader.bool();
+          continue;
+        }
+        case 7: {
+          if (tag !== 57) {
+            break;
+          }
+
+          message.bbnReuse = reader.double();
+          continue;
+        }
+        case 8: {
+          if (tag !== 65) {
+            break;
+          }
+
+          message.boxReuse = reader.double();
+          continue;
+        }
+        case 9: {
+          if (tag !== 73) {
+            break;
+          }
+
+          message.boxCost = reader.double();
           continue;
         }
-        case 2: {
-          if (tag !== 18) {
+        case 10: {
+          if (tag !== 81) {
             break;
           }
 
-          message.bbcName = reader.string();
+          message.bobinCost = reader.double();
           continue;
         }
-        case 3: {
-          if (tag !== 26) {
+        case 11: {
+          if (tag !== 89) {
             break;
           }
 
-          message.bbcType = reader.string();
+          message.boxCostVal = reader.double();
           continue;
         }
-        case 4: {
-          if (tag !== 32) {
+        case 12: {
+          if (tag !== 97) {
             break;
           }
 
-          message.noOfBob = reader.int32();
+          message.bobinCostVal = reader.double();
           continue;
         }
-        case 5: {
-          if (tag !== 42) {
+        case 13: {
+          if (tag !== 105) {
             break;
           }
 
-          message.notes = reader.string();
+          message.bbnReuseVal = reader.double();
           continue;
         }
-        case 6: {
-          if (tag !== 48) {
+        case 14: {
+          if (tag !== 113) {
             break;
           }
 
-          message.isActive = reader.bool();
+          message.boxReuseVal = reader.double();
           continue;
         }
       }
@@ -4737,6 +6566,46 @@ export const UpdateBoxBobbinCostRequest: MessageFns<UpdateBoxBobbinCostRequest>
         : isSet(object.is_active)
         ? globalThis.Boolean(object.is_active)
         : undefined,
+      bbnReuse: isSet(object.bbnReuse)
+        ? globalThis.Number(object.bbnReuse)
+        : isSet(object.bbn_reuse)
+        ? globalThis.Number(object.bbn_reuse)
+        : undefined,
+      boxReuse: isSet(object.boxReuse)
+        ? globalThis.Number(object.boxReuse)
+        : isSet(object.box_reuse)
+        ? globalThis.Number(object.box_reuse)
+        : undefined,
+      boxCost: isSet(object.boxCost)
+        ? globalThis.Number(object.boxCost)
+        : isSet(object.box_cost)
+        ? globalThis.Number(object.box_cost)
+        : undefined,
+      bobinCost: isSet(object.bobinCost)
+        ? globalThis.Number(object.bobinCost)
+        : isSet(object.bobin_cost)
+        ? globalThis.Number(object.bobin_cost)
+        : undefined,
+      boxCostVal: isSet(object.boxCostVal)
+        ? globalThis.Number(object.boxCostVal)
+        : isSet(object.box_cost_val)
+        ? globalThis.Number(object.box_cost_val)
+        : undefined,
+      bobinCostVal: isSet(object.bobinCostVal)
+        ? globalThis.Number(object.bobinCostVal)
+        : isSet(object.bobin_cost_val)
+        ? globalThis.Number(object.bobin_cost_val)
+        : undefined,
+      bbnReuseVal: isSet(object.bbnReuseVal)
+        ? globalThis.Number(object.bbnReuseVal)
+        : isSet(object.bbn_reuse_val)
+        ? globalThis.Number(object.bbn_reuse_val)
+        : undefined,
+      boxReuseVal: isSet(object.boxReuseVal)
+        ? globalThis.Number(object.boxReuseVal)
+        : isSet(object.box_reuse_val)
+        ? globalThis.Number(object.box_reuse_val)
+        : undefined,
     };
   },
 
@@ -4760,6 +6629,30 @@ export const UpdateBoxBobbinCostRequest: MessageFns<UpdateBoxBobbinCostRequest>
     if (message.isActive !== undefined) {
       obj.isActive = message.isActive;
     }
+    if (message.bbnReuse !== undefined) {
+      obj.bbnReuse = message.bbnReuse;
+    }
+    if (message.boxReuse !== undefined) {
+      obj.boxReuse = message.boxReuse;
+    }
+    if (message.boxCost !== undefined) {
+      obj.boxCost = message.boxCost;
+    }
+    if (message.bobinCost !== undefined) {
+      obj.bobinCost = message.bobinCost;
+    }
+    if (message.boxCostVal !== undefined) {
+      obj.boxCostVal = message.boxCostVal;
+    }
+    if (message.bobinCostVal !== undefined) {
+      obj.bobinCostVal = message.bobinCostVal;
+    }
+    if (message.bbnReuseVal !== undefined) {
+      obj.bbnReuseVal = message.bbnReuseVal;
+    }
+    if (message.boxReuseVal !== undefined) {
+      obj.boxReuseVal = message.boxReuseVal;
+    }
     return obj;
   },
 
@@ -4774,6 +6667,14 @@ export const UpdateBoxBobbinCostRequest: MessageFns<UpdateBoxBobbinCostRequest>
     message.noOfBob = object.noOfBob ?? undefined;
     message.notes = object.notes ?? undefined;
     message.isActive = object.isActive ?? undefined;
+    message.bbnReuse = object.bbnReuse ?? undefined;
+    message.boxReuse = object.boxReuse ?? undefined;
+    message.boxCost = object.boxCost ?? undefined;
+    message.bobinCost = object.bobinCost ?? undefined;
+    message.boxCostVal = object.boxCostVal ?? undefined;
+    message.bobinCostVal = object.bobinCostVal ?? undefined;
+    message.bbnReuseVal = object.bbnReuseVal ?? undefined;
+    message.boxReuseVal = object.boxReuseVal ?? undefined;
     return message;
   },
 };
@@ -7884,6 +9785,12 @@ function createBaseProductGrade(): ProductGrade {
     bcRecoveryRate: 0,
     isActive: false,
     notes: "",
+    pgDetailProduct: "",
+    pgGradeLabel: "",
+    stdSellingPrice: 0,
+    spValue: 0,
+    lossPct: undefined,
+    seqNo: undefined,
     audit: undefined,
   };
 }
@@ -7917,6 +9824,24 @@ export const ProductGrade: MessageFns<ProductGrade> = {
     if (message.notes !== "") {
       writer.uint32(74).string(message.notes);
     }
+    if (message.pgDetailProduct !== "") {
+      writer.uint32(82).string(message.pgDetailProduct);
+    }
+    if (message.pgGradeLabel !== "") {
+      writer.uint32(90).string(message.pgGradeLabel);
+    }
+    if (message.stdSellingPrice !== 0) {
+      writer.uint32(97).double(message.stdSellingPrice);
+    }
+    if (message.spValue !== 0) {
+      writer.uint32(105).double(message.spValue);
+    }
+    if (message.lossPct !== undefined) {
+      writer.uint32(113).double(message.lossPct);
+    }
+    if (message.seqNo !== undefined) {
+      writer.uint32(120).int32(message.seqNo);
+    }
     if (message.audit !== undefined) {
       AuditInfo.encode(message.audit, writer.uint32(130).fork()).join();
     }
@@ -8002,6 +9927,54 @@ export const ProductGrade: MessageFns<ProductGrade> = {
           message.notes = reader.string();
           continue;
         }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.pgDetailProduct = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 90) {
+            break;
+          }
+
+          message.pgGradeLabel = reader.string();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.stdSellingPrice = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.spValue = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 113) {
+            break;
+          }
+
+          message.lossPct = reader.double();
+          continue;
+        }
+        case 15: {
+          if (tag !== 120) {
+            break;
+          }
+
+          message.seqNo = reader.int32();
+          continue;
+        }
         case 16: {
           if (tag !== 130) {
             break;
@@ -8062,6 +10035,36 @@ export const ProductGrade: MessageFns<ProductGrade> = {
         ? globalThis.Boolean(object.is_active)
         : false,
       notes: isSet(object.notes) ? globalThis.String(object.notes) : "",
+      pgDetailProduct: isSet(object.pgDetailProduct)
+        ? globalThis.String(object.pgDetailProduct)
+        : isSet(object.pg_detail_product)
+        ? globalThis.String(object.pg_detail_product)
+        : "",
+      pgGradeLabel: isSet(object.pgGradeLabel)
+        ? globalThis.String(object.pgGradeLabel)
+        : isSet(object.pg_grade_label)
+        ? globalThis.String(object.pg_grade_label)
+        : "",
+      stdSellingPrice: isSet(object.stdSellingPrice)
+        ? globalThis.Number(object.stdSellingPrice)
+        : isSet(object.std_selling_price)
+        ? globalThis.Number(object.std_selling_price)
+        : 0,
+      spValue: isSet(object.spValue)
+        ? globalThis.Number(object.spValue)
+        : isSet(object.sp_value)
+        ? globalThis.Number(object.sp_value)
+        : 0,
+      lossPct: isSet(object.lossPct)
+        ? globalThis.Number(object.lossPct)
+        : isSet(object.loss_pct)
+        ? globalThis.Number(object.loss_pct)
+        : undefined,
+      seqNo: isSet(object.seqNo)
+        ? globalThis.Number(object.seqNo)
+        : isSet(object.seq_no)
+        ? globalThis.Number(object.seq_no)
+        : undefined,
       audit: isSet(object.audit) ? AuditInfo.fromJSON(object.audit) : undefined,
     };
   },
@@ -8095,6 +10098,24 @@ export const ProductGrade: MessageFns<ProductGrade> = {
     if (message.notes !== "") {
       obj.notes = message.notes;
     }
+    if (message.pgDetailProduct !== "") {
+      obj.pgDetailProduct = message.pgDetailProduct;
+    }
+    if (message.pgGradeLabel !== "") {
+      obj.pgGradeLabel = message.pgGradeLabel;
+    }
+    if (message.stdSellingPrice !== 0) {
+      obj.stdSellingPrice = message.stdSellingPrice;
+    }
+    if (message.spValue !== 0) {
+      obj.spValue = message.spValue;
+    }
+    if (message.lossPct !== undefined) {
+      obj.lossPct = message.lossPct;
+    }
+    if (message.seqNo !== undefined) {
+      obj.seqNo = Math.round(message.seqNo);
+    }
     if (message.audit !== undefined) {
       obj.audit = AuditInfo.toJSON(message.audit);
     }
@@ -8115,6 +10136,12 @@ export const ProductGrade: MessageFns<ProductGrade> = {
     message.bcRecoveryRate = object.bcRecoveryRate ?? 0;
     message.isActive = object.isActive ?? false;
     message.notes = object.notes ?? "";
+    message.pgDetailProduct = object.pgDetailProduct ?? "";
+    message.pgGradeLabel = object.pgGradeLabel ?? "";
+    message.stdSellingPrice = object.stdSellingPrice ?? 0;
+    message.spValue = object.spValue ?? 0;
+    message.lossPct = object.lossPct ?? undefined;
+    message.seqNo = object.seqNo ?? undefined;
     message.audit = (object.audit !== undefined && object.audit !== null)
       ? AuditInfo.fromPartial(object.audit)
       : undefined;
@@ -8123,7 +10150,21 @@ export const ProductGrade: MessageFns<ProductGrade> = {
 };
 
 function createBaseCreateProductGradeRequest(): CreateProductGradeRequest {
-  return { pgCode: "", pgName: "", pgDescription: "", bcPerc: 0, nonStdPerc: 0, bcRecoveryRate: 0, notes: "" };
+  return {
+    pgCode: "",
+    pgName: "",
+    pgDescription: "",
+    bcPerc: 0,
+    nonStdPerc: 0,
+    bcRecoveryRate: 0,
+    notes: "",
+    pgDetailProduct: "",
+    pgGradeLabel: "",
+    stdSellingPrice: 0,
+    spValue: 0,
+    lossPct: undefined,
+    seqNo: undefined,
+  };
 }
 
 export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> = {
@@ -8149,6 +10190,24 @@ export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> =
     if (message.notes !== "") {
       writer.uint32(58).string(message.notes);
     }
+    if (message.pgDetailProduct !== "") {
+      writer.uint32(66).string(message.pgDetailProduct);
+    }
+    if (message.pgGradeLabel !== "") {
+      writer.uint32(74).string(message.pgGradeLabel);
+    }
+    if (message.stdSellingPrice !== 0) {
+      writer.uint32(81).double(message.stdSellingPrice);
+    }
+    if (message.spValue !== 0) {
+      writer.uint32(89).double(message.spValue);
+    }
+    if (message.lossPct !== undefined) {
+      writer.uint32(97).double(message.lossPct);
+    }
+    if (message.seqNo !== undefined) {
+      writer.uint32(104).int32(message.seqNo);
+    }
     return writer;
   },
 
@@ -8215,6 +10274,54 @@ export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> =
           message.notes = reader.string();
           continue;
         }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.pgDetailProduct = reader.string();
+          continue;
+        }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+
+          message.pgGradeLabel = reader.string();
+          continue;
+        }
+        case 10: {
+          if (tag !== 81) {
+            break;
+          }
+
+          message.stdSellingPrice = reader.double();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.spValue = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.lossPct = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 104) {
+            break;
+          }
+
+          message.seqNo = reader.int32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -8257,6 +10364,36 @@ export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> =
         ? globalThis.Number(object.bc_recovery_rate)
         : 0,
       notes: isSet(object.notes) ? globalThis.String(object.notes) : "",
+      pgDetailProduct: isSet(object.pgDetailProduct)
+        ? globalThis.String(object.pgDetailProduct)
+        : isSet(object.pg_detail_product)
+        ? globalThis.String(object.pg_detail_product)
+        : "",
+      pgGradeLabel: isSet(object.pgGradeLabel)
+        ? globalThis.String(object.pgGradeLabel)
+        : isSet(object.pg_grade_label)
+        ? globalThis.String(object.pg_grade_label)
+        : "",
+      stdSellingPrice: isSet(object.stdSellingPrice)
+        ? globalThis.Number(object.stdSellingPrice)
+        : isSet(object.std_selling_price)
+        ? globalThis.Number(object.std_selling_price)
+        : 0,
+      spValue: isSet(object.spValue)
+        ? globalThis.Number(object.spValue)
+        : isSet(object.sp_value)
+        ? globalThis.Number(object.sp_value)
+        : 0,
+      lossPct: isSet(object.lossPct)
+        ? globalThis.Number(object.lossPct)
+        : isSet(object.loss_pct)
+        ? globalThis.Number(object.loss_pct)
+        : undefined,
+      seqNo: isSet(object.seqNo)
+        ? globalThis.Number(object.seqNo)
+        : isSet(object.seq_no)
+        ? globalThis.Number(object.seq_no)
+        : undefined,
     };
   },
 
@@ -8283,6 +10420,24 @@ export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> =
     if (message.notes !== "") {
       obj.notes = message.notes;
     }
+    if (message.pgDetailProduct !== "") {
+      obj.pgDetailProduct = message.pgDetailProduct;
+    }
+    if (message.pgGradeLabel !== "") {
+      obj.pgGradeLabel = message.pgGradeLabel;
+    }
+    if (message.stdSellingPrice !== 0) {
+      obj.stdSellingPrice = message.stdSellingPrice;
+    }
+    if (message.spValue !== 0) {
+      obj.spValue = message.spValue;
+    }
+    if (message.lossPct !== undefined) {
+      obj.lossPct = message.lossPct;
+    }
+    if (message.seqNo !== undefined) {
+      obj.seqNo = Math.round(message.seqNo);
+    }
     return obj;
   },
 
@@ -8298,6 +10453,12 @@ export const CreateProductGradeRequest: MessageFns<CreateProductGradeRequest> =
     message.nonStdPerc = object.nonStdPerc ?? 0;
     message.bcRecoveryRate = object.bcRecoveryRate ?? 0;
     message.notes = object.notes ?? "";
+    message.pgDetailProduct = object.pgDetailProduct ?? "";
+    message.pgGradeLabel = object.pgGradeLabel ?? "";
+    message.stdSellingPrice = object.stdSellingPrice ?? 0;
+    message.spValue = object.spValue ?? 0;
+    message.lossPct = object.lossPct ?? undefined;
+    message.seqNo = object.seqNo ?? undefined;
     return message;
   },
 };
@@ -8536,6 +10697,12 @@ function createBaseUpdateProductGradeRequest(): UpdateProductGradeRequest {
     bcRecoveryRate: undefined,
     notes: undefined,
     isActive: undefined,
+    pgDetailProduct: undefined,
+    pgGradeLabel: undefined,
+    stdSellingPrice: undefined,
+    spValue: undefined,
+    lossPct: undefined,
+    seqNo: undefined,
   };
 }
 
@@ -8565,6 +10732,24 @@ export const UpdateProductGradeRequest: MessageFns<UpdateProductGradeRequest> =
     if (message.isActive !== undefined) {
       writer.uint32(64).bool(message.isActive);
     }
+    if (message.pgDetailProduct !== undefined) {
+      writer.uint32(74).string(message.pgDetailProduct);
+    }
+    if (message.pgGradeLabel !== undefined) {
+      writer.uint32(82).string(message.pgGradeLabel);
+    }
+    if (message.stdSellingPrice !== undefined) {
+      writer.uint32(89).double(message.stdSellingPrice);
+    }
+    if (message.spValue !== undefined) {
+      writer.uint32(97).double(message.spValue);
+    }
+    if (message.lossPct !== undefined) {
+      writer.uint32(105).double(message.lossPct);
+    }
+    if (message.seqNo !== undefined) {
+      writer.uint32(112).int32(message.seqNo);
+    }
     return writer;
   },
 
@@ -8639,6 +10824,54 @@ export const UpdateProductGradeRequest: MessageFns<UpdateProductGradeRequest> =
           message.isActive = reader.bool();
           continue;
         }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+
+          message.pgDetailProduct = reader.string();
+          continue;
+        }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.pgGradeLabel = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.stdSellingPrice = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.spValue = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.lossPct = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 112) {
+            break;
+          }
+
+          message.seqNo = reader.int32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -8686,6 +10919,36 @@ export const UpdateProductGradeRequest: MessageFns<UpdateProductGradeRequest> =
         : isSet(object.is_active)
         ? globalThis.Boolean(object.is_active)
         : undefined,
+      pgDetailProduct: isSet(object.pgDetailProduct)
+        ? globalThis.String(object.pgDetailProduct)
+        : isSet(object.pg_detail_product)
+        ? globalThis.String(object.pg_detail_product)
+        : undefined,
+      pgGradeLabel: isSet(object.pgGradeLabel)
+        ? globalThis.String(object.pgGradeLabel)
+        : isSet(object.pg_grade_label)
+        ? globalThis.String(object.pg_grade_label)
+        : undefined,
+      stdSellingPrice: isSet(object.stdSellingPrice)
+        ? globalThis.Number(object.stdSellingPrice)
+        : isSet(object.std_selling_price)
+        ? globalThis.Number(object.std_selling_price)
+        : undefined,
+      spValue: isSet(object.spValue)
+        ? globalThis.Number(object.spValue)
+        : isSet(object.sp_value)
+        ? globalThis.Number(object.sp_value)
+        : undefined,
+      lossPct: isSet(object.lossPct)
+        ? globalThis.Number(object.lossPct)
+        : isSet(object.loss_pct)
+        ? globalThis.Number(object.loss_pct)
+        : undefined,
+      seqNo: isSet(object.seqNo)
+        ? globalThis.Number(object.seqNo)
+        : isSet(object.seq_no)
+        ? globalThis.Number(object.seq_no)
+        : undefined,
     };
   },
 
@@ -8715,6 +10978,24 @@ export const UpdateProductGradeRequest: MessageFns<UpdateProductGradeRequest> =
     if (message.isActive !== undefined) {
       obj.isActive = message.isActive;
     }
+    if (message.pgDetailProduct !== undefined) {
+      obj.pgDetailProduct = message.pgDetailProduct;
+    }
+    if (message.pgGradeLabel !== undefined) {
+      obj.pgGradeLabel = message.pgGradeLabel;
+    }
+    if (message.stdSellingPrice !== undefined) {
+      obj.stdSellingPrice = message.stdSellingPrice;
+    }
+    if (message.spValue !== undefined) {
+      obj.spValue = message.spValue;
+    }
+    if (message.lossPct !== undefined) {
+      obj.lossPct = message.lossPct;
+    }
+    if (message.seqNo !== undefined) {
+      obj.seqNo = Math.round(message.seqNo);
+    }
     return obj;
   },
 
@@ -8731,6 +11012,12 @@ export const UpdateProductGradeRequest: MessageFns<UpdateProductGradeRequest> =
     message.bcRecoveryRate = object.bcRecoveryRate ?? undefined;
     message.notes = object.notes ?? undefined;
     message.isActive = object.isActive ?? undefined;
+    message.pgDetailProduct = object.pgDetailProduct ?? undefined;
+    message.pgGradeLabel = object.pgGradeLabel ?? undefined;
+    message.stdSellingPrice = object.stdSellingPrice ?? undefined;
+    message.spValue = object.spValue ?? undefined;
+    message.lossPct = object.lossPct ?? undefined;
+    message.seqNo = object.seqNo ?? undefined;
     return message;
   },
 };
@@ -9754,6 +12041,11 @@ function createBaseMBHead(): MBHead {
     mbhFilament: undefined,
     mbhDozing: undefined,
     mbhIsActive: false,
+    mbhCheckStatus: undefined,
+    mbhStatus: undefined,
+    mbhLdrPrsn: undefined,
+    mbhFinalProduct: undefined,
+    mbhCode: undefined,
     audit: undefined,
   };
 }
@@ -9784,6 +12076,21 @@ export const MBHead: MessageFns<MBHead> = {
     if (message.mbhIsActive !== false) {
       writer.uint32(64).bool(message.mbhIsActive);
     }
+    if (message.mbhCheckStatus !== undefined) {
+      writer.uint32(74).string(message.mbhCheckStatus);
+    }
+    if (message.mbhStatus !== undefined) {
+      writer.uint32(82).string(message.mbhStatus);
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      writer.uint32(89).double(message.mbhLdrPrsn);
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      writer.uint32(98).string(message.mbhFinalProduct);
+    }
+    if (message.mbhCode !== undefined) {
+      writer.uint32(106).string(message.mbhCode);
+    }
     if (message.audit !== undefined) {
       AuditInfo.encode(message.audit, writer.uint32(130).fork()).join();
     }
@@ -9850,15 +12157,55 @@ export const MBHead: MessageFns<MBHead> = {
             break;
           }
 
-          message.mbhDozing = reader.double();
+          message.mbhDozing = reader.double();
+          continue;
+        }
+        case 8: {
+          if (tag !== 64) {
+            break;
+          }
+
+          message.mbhIsActive = reader.bool();
+          continue;
+        }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+
+          message.mbhCheckStatus = reader.string();
+          continue;
+        }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.mbhStatus = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.mbhLdrPrsn = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 98) {
+            break;
+          }
+
+          message.mbhFinalProduct = reader.string();
           continue;
         }
-        case 8: {
-          if (tag !== 64) {
+        case 13: {
+          if (tag !== 106) {
             break;
           }
 
-          message.mbhIsActive = reader.bool();
+          message.mbhCode = reader.string();
           continue;
         }
         case 16: {
@@ -9920,6 +12267,31 @@ export const MBHead: MessageFns<MBHead> = {
         : isSet(object.mbh_is_active)
         ? globalThis.Boolean(object.mbh_is_active)
         : false,
+      mbhCheckStatus: isSet(object.mbhCheckStatus)
+        ? globalThis.String(object.mbhCheckStatus)
+        : isSet(object.mbh_check_status)
+        ? globalThis.String(object.mbh_check_status)
+        : undefined,
+      mbhStatus: isSet(object.mbhStatus)
+        ? globalThis.String(object.mbhStatus)
+        : isSet(object.mbh_status)
+        ? globalThis.String(object.mbh_status)
+        : undefined,
+      mbhLdrPrsn: isSet(object.mbhLdrPrsn)
+        ? globalThis.Number(object.mbhLdrPrsn)
+        : isSet(object.mbh_ldr_prsn)
+        ? globalThis.Number(object.mbh_ldr_prsn)
+        : undefined,
+      mbhFinalProduct: isSet(object.mbhFinalProduct)
+        ? globalThis.String(object.mbhFinalProduct)
+        : isSet(object.mbh_final_product)
+        ? globalThis.String(object.mbh_final_product)
+        : undefined,
+      mbhCode: isSet(object.mbhCode)
+        ? globalThis.String(object.mbhCode)
+        : isSet(object.mbh_code)
+        ? globalThis.String(object.mbh_code)
+        : undefined,
       audit: isSet(object.audit) ? AuditInfo.fromJSON(object.audit) : undefined,
     };
   },
@@ -9950,6 +12322,21 @@ export const MBHead: MessageFns<MBHead> = {
     if (message.mbhIsActive !== false) {
       obj.mbhIsActive = message.mbhIsActive;
     }
+    if (message.mbhCheckStatus !== undefined) {
+      obj.mbhCheckStatus = message.mbhCheckStatus;
+    }
+    if (message.mbhStatus !== undefined) {
+      obj.mbhStatus = message.mbhStatus;
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      obj.mbhLdrPrsn = message.mbhLdrPrsn;
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      obj.mbhFinalProduct = message.mbhFinalProduct;
+    }
+    if (message.mbhCode !== undefined) {
+      obj.mbhCode = message.mbhCode;
+    }
     if (message.audit !== undefined) {
       obj.audit = AuditInfo.toJSON(message.audit);
     }
@@ -9969,6 +12356,11 @@ export const MBHead: MessageFns<MBHead> = {
     message.mbhFilament = object.mbhFilament ?? undefined;
     message.mbhDozing = object.mbhDozing ?? undefined;
     message.mbhIsActive = object.mbhIsActive ?? false;
+    message.mbhCheckStatus = object.mbhCheckStatus ?? undefined;
+    message.mbhStatus = object.mbhStatus ?? undefined;
+    message.mbhLdrPrsn = object.mbhLdrPrsn ?? undefined;
+    message.mbhFinalProduct = object.mbhFinalProduct ?? undefined;
+    message.mbhCode = object.mbhCode ?? undefined;
     message.audit = (object.audit !== undefined && object.audit !== null)
       ? AuditInfo.fromPartial(object.audit)
       : undefined;
@@ -9984,6 +12376,11 @@ function createBaseCreateMBHeadRequest(): CreateMBHeadRequest {
     mbhDenier: undefined,
     mbhFilament: undefined,
     mbhDozing: undefined,
+    mbhCheckStatus: undefined,
+    mbhStatus: undefined,
+    mbhLdrPrsn: undefined,
+    mbhFinalProduct: undefined,
+    mbhCode: undefined,
   };
 }
 
@@ -10007,6 +12404,21 @@ export const CreateMBHeadRequest: MessageFns<CreateMBHeadRequest> = {
     if (message.mbhDozing !== undefined) {
       writer.uint32(49).double(message.mbhDozing);
     }
+    if (message.mbhCheckStatus !== undefined) {
+      writer.uint32(58).string(message.mbhCheckStatus);
+    }
+    if (message.mbhStatus !== undefined) {
+      writer.uint32(66).string(message.mbhStatus);
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      writer.uint32(73).double(message.mbhLdrPrsn);
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      writer.uint32(82).string(message.mbhFinalProduct);
+    }
+    if (message.mbhCode !== undefined) {
+      writer.uint32(90).string(message.mbhCode);
+    }
     return writer;
   },
 
@@ -10065,6 +12477,46 @@ export const CreateMBHeadRequest: MessageFns<CreateMBHeadRequest> = {
           message.mbhDozing = reader.double();
           continue;
         }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+
+          message.mbhCheckStatus = reader.string();
+          continue;
+        }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.mbhStatus = reader.string();
+          continue;
+        }
+        case 9: {
+          if (tag !== 73) {
+            break;
+          }
+
+          message.mbhLdrPrsn = reader.double();
+          continue;
+        }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.mbhFinalProduct = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 90) {
+            break;
+          }
+
+          message.mbhCode = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -10106,6 +12558,31 @@ export const CreateMBHeadRequest: MessageFns<CreateMBHeadRequest> = {
         : isSet(object.mbh_dozing)
         ? globalThis.Number(object.mbh_dozing)
         : undefined,
+      mbhCheckStatus: isSet(object.mbhCheckStatus)
+        ? globalThis.String(object.mbhCheckStatus)
+        : isSet(object.mbh_check_status)
+        ? globalThis.String(object.mbh_check_status)
+        : undefined,
+      mbhStatus: isSet(object.mbhStatus)
+        ? globalThis.String(object.mbhStatus)
+        : isSet(object.mbh_status)
+        ? globalThis.String(object.mbh_status)
+        : undefined,
+      mbhLdrPrsn: isSet(object.mbhLdrPrsn)
+        ? globalThis.Number(object.mbhLdrPrsn)
+        : isSet(object.mbh_ldr_prsn)
+        ? globalThis.Number(object.mbh_ldr_prsn)
+        : undefined,
+      mbhFinalProduct: isSet(object.mbhFinalProduct)
+        ? globalThis.String(object.mbhFinalProduct)
+        : isSet(object.mbh_final_product)
+        ? globalThis.String(object.mbh_final_product)
+        : undefined,
+      mbhCode: isSet(object.mbhCode)
+        ? globalThis.String(object.mbhCode)
+        : isSet(object.mbh_code)
+        ? globalThis.String(object.mbh_code)
+        : undefined,
     };
   },
 
@@ -10129,6 +12606,21 @@ export const CreateMBHeadRequest: MessageFns<CreateMBHeadRequest> = {
     if (message.mbhDozing !== undefined) {
       obj.mbhDozing = message.mbhDozing;
     }
+    if (message.mbhCheckStatus !== undefined) {
+      obj.mbhCheckStatus = message.mbhCheckStatus;
+    }
+    if (message.mbhStatus !== undefined) {
+      obj.mbhStatus = message.mbhStatus;
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      obj.mbhLdrPrsn = message.mbhLdrPrsn;
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      obj.mbhFinalProduct = message.mbhFinalProduct;
+    }
+    if (message.mbhCode !== undefined) {
+      obj.mbhCode = message.mbhCode;
+    }
     return obj;
   },
 
@@ -10143,6 +12635,11 @@ export const CreateMBHeadRequest: MessageFns<CreateMBHeadRequest> = {
     message.mbhDenier = object.mbhDenier ?? undefined;
     message.mbhFilament = object.mbhFilament ?? undefined;
     message.mbhDozing = object.mbhDozing ?? undefined;
+    message.mbhCheckStatus = object.mbhCheckStatus ?? undefined;
+    message.mbhStatus = object.mbhStatus ?? undefined;
+    message.mbhLdrPrsn = object.mbhLdrPrsn ?? undefined;
+    message.mbhFinalProduct = object.mbhFinalProduct ?? undefined;
+    message.mbhCode = object.mbhCode ?? undefined;
     return message;
   },
 };
@@ -10376,6 +12873,11 @@ function createBaseUpdateMBHeadRequest(): UpdateMBHeadRequest {
     mbhFilament: undefined,
     mbhDozing: undefined,
     mbhIsActive: undefined,
+    mbhCheckStatus: undefined,
+    mbhStatus: undefined,
+    mbhLdrPrsn: undefined,
+    mbhFinalProduct: undefined,
+    mbhCode: undefined,
   };
 }
 
@@ -10402,6 +12904,21 @@ export const UpdateMBHeadRequest: MessageFns<UpdateMBHeadRequest> = {
     if (message.mbhIsActive !== undefined) {
       writer.uint32(56).bool(message.mbhIsActive);
     }
+    if (message.mbhCheckStatus !== undefined) {
+      writer.uint32(66).string(message.mbhCheckStatus);
+    }
+    if (message.mbhStatus !== undefined) {
+      writer.uint32(74).string(message.mbhStatus);
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      writer.uint32(81).double(message.mbhLdrPrsn);
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      writer.uint32(90).string(message.mbhFinalProduct);
+    }
+    if (message.mbhCode !== undefined) {
+      writer.uint32(98).string(message.mbhCode);
+    }
     return writer;
   },
 
@@ -10468,6 +12985,46 @@ export const UpdateMBHeadRequest: MessageFns<UpdateMBHeadRequest> = {
           message.mbhIsActive = reader.bool();
           continue;
         }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.mbhCheckStatus = reader.string();
+          continue;
+        }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+
+          message.mbhStatus = reader.string();
+          continue;
+        }
+        case 10: {
+          if (tag !== 81) {
+            break;
+          }
+
+          message.mbhLdrPrsn = reader.double();
+          continue;
+        }
+        case 11: {
+          if (tag !== 90) {
+            break;
+          }
+
+          message.mbhFinalProduct = reader.string();
+          continue;
+        }
+        case 12: {
+          if (tag !== 98) {
+            break;
+          }
+
+          message.mbhCode = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -10514,6 +13071,31 @@ export const UpdateMBHeadRequest: MessageFns<UpdateMBHeadRequest> = {
         : isSet(object.mbh_is_active)
         ? globalThis.Boolean(object.mbh_is_active)
         : undefined,
+      mbhCheckStatus: isSet(object.mbhCheckStatus)
+        ? globalThis.String(object.mbhCheckStatus)
+        : isSet(object.mbh_check_status)
+        ? globalThis.String(object.mbh_check_status)
+        : undefined,
+      mbhStatus: isSet(object.mbhStatus)
+        ? globalThis.String(object.mbhStatus)
+        : isSet(object.mbh_status)
+        ? globalThis.String(object.mbh_status)
+        : undefined,
+      mbhLdrPrsn: isSet(object.mbhLdrPrsn)
+        ? globalThis.Number(object.mbhLdrPrsn)
+        : isSet(object.mbh_ldr_prsn)
+        ? globalThis.Number(object.mbh_ldr_prsn)
+        : undefined,
+      mbhFinalProduct: isSet(object.mbhFinalProduct)
+        ? globalThis.String(object.mbhFinalProduct)
+        : isSet(object.mbh_final_product)
+        ? globalThis.String(object.mbh_final_product)
+        : undefined,
+      mbhCode: isSet(object.mbhCode)
+        ? globalThis.String(object.mbhCode)
+        : isSet(object.mbh_code)
+        ? globalThis.String(object.mbh_code)
+        : undefined,
     };
   },
 
@@ -10540,6 +13122,21 @@ export const UpdateMBHeadRequest: MessageFns<UpdateMBHeadRequest> = {
     if (message.mbhIsActive !== undefined) {
       obj.mbhIsActive = message.mbhIsActive;
     }
+    if (message.mbhCheckStatus !== undefined) {
+      obj.mbhCheckStatus = message.mbhCheckStatus;
+    }
+    if (message.mbhStatus !== undefined) {
+      obj.mbhStatus = message.mbhStatus;
+    }
+    if (message.mbhLdrPrsn !== undefined) {
+      obj.mbhLdrPrsn = message.mbhLdrPrsn;
+    }
+    if (message.mbhFinalProduct !== undefined) {
+      obj.mbhFinalProduct = message.mbhFinalProduct;
+    }
+    if (message.mbhCode !== undefined) {
+      obj.mbhCode = message.mbhCode;
+    }
     return obj;
   },
 
@@ -10555,6 +13152,11 @@ export const UpdateMBHeadRequest: MessageFns<UpdateMBHeadRequest> = {
     message.mbhFilament = object.mbhFilament ?? undefined;
     message.mbhDozing = object.mbhDozing ?? undefined;
     message.mbhIsActive = object.mbhIsActive ?? undefined;
+    message.mbhCheckStatus = object.mbhCheckStatus ?? undefined;
+    message.mbhStatus = object.mbhStatus ?? undefined;
+    message.mbhLdrPrsn = object.mbhLdrPrsn ?? undefined;
+    message.mbhFinalProduct = object.mbhFinalProduct ?? undefined;
+    message.mbhCode = object.mbhCode ?? undefined;
     return message;
   },
 };
@@ -11577,6 +14179,11 @@ function createBaseMBSpin(): MBSpin {
     mbsDozing: undefined,
     mbsMbCosting: "",
     mbsIsActive: false,
+    mbsCc: undefined,
+    mbsCostRateMkt: undefined,
+    mbsStatus: undefined,
+    mbsLdrPrsn: undefined,
+    mbsFinalProduct: undefined,
     audit: undefined,
   };
 }
@@ -11610,6 +14217,21 @@ export const MBSpin: MessageFns<MBSpin> = {
     if (message.mbsIsActive !== false) {
       writer.uint32(72).bool(message.mbsIsActive);
     }
+    if (message.mbsCc !== undefined) {
+      writer.uint32(82).string(message.mbsCc);
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      writer.uint32(89).double(message.mbsCostRateMkt);
+    }
+    if (message.mbsStatus !== undefined) {
+      writer.uint32(98).string(message.mbsStatus);
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      writer.uint32(105).double(message.mbsLdrPrsn);
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      writer.uint32(114).string(message.mbsFinalProduct);
+    }
     if (message.audit !== undefined) {
       AuditInfo.encode(message.audit, writer.uint32(130).fork()).join();
     }
@@ -11695,6 +14317,46 @@ export const MBSpin: MessageFns<MBSpin> = {
           message.mbsIsActive = reader.bool();
           continue;
         }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.mbsCc = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.mbsCostRateMkt = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 98) {
+            break;
+          }
+
+          message.mbsStatus = reader.string();
+          continue;
+        }
+        case 13: {
+          if (tag !== 105) {
+            break;
+          }
+
+          message.mbsLdrPrsn = reader.double();
+          continue;
+        }
+        case 14: {
+          if (tag !== 114) {
+            break;
+          }
+
+          message.mbsFinalProduct = reader.string();
+          continue;
+        }
         case 16: {
           if (tag !== 130) {
             break;
@@ -11759,6 +14421,31 @@ export const MBSpin: MessageFns<MBSpin> = {
         : isSet(object.mbs_is_active)
         ? globalThis.Boolean(object.mbs_is_active)
         : false,
+      mbsCc: isSet(object.mbsCc)
+        ? globalThis.String(object.mbsCc)
+        : isSet(object.mbs_cc)
+        ? globalThis.String(object.mbs_cc)
+        : undefined,
+      mbsCostRateMkt: isSet(object.mbsCostRateMkt)
+        ? globalThis.Number(object.mbsCostRateMkt)
+        : isSet(object.mbs_cost_rate_mkt)
+        ? globalThis.Number(object.mbs_cost_rate_mkt)
+        : undefined,
+      mbsStatus: isSet(object.mbsStatus)
+        ? globalThis.String(object.mbsStatus)
+        : isSet(object.mbs_status)
+        ? globalThis.String(object.mbs_status)
+        : undefined,
+      mbsLdrPrsn: isSet(object.mbsLdrPrsn)
+        ? globalThis.Number(object.mbsLdrPrsn)
+        : isSet(object.mbs_ldr_prsn)
+        ? globalThis.Number(object.mbs_ldr_prsn)
+        : undefined,
+      mbsFinalProduct: isSet(object.mbsFinalProduct)
+        ? globalThis.String(object.mbsFinalProduct)
+        : isSet(object.mbs_final_product)
+        ? globalThis.String(object.mbs_final_product)
+        : undefined,
       audit: isSet(object.audit) ? AuditInfo.fromJSON(object.audit) : undefined,
     };
   },
@@ -11792,6 +14479,21 @@ export const MBSpin: MessageFns<MBSpin> = {
     if (message.mbsIsActive !== false) {
       obj.mbsIsActive = message.mbsIsActive;
     }
+    if (message.mbsCc !== undefined) {
+      obj.mbsCc = message.mbsCc;
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      obj.mbsCostRateMkt = message.mbsCostRateMkt;
+    }
+    if (message.mbsStatus !== undefined) {
+      obj.mbsStatus = message.mbsStatus;
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      obj.mbsLdrPrsn = message.mbsLdrPrsn;
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      obj.mbsFinalProduct = message.mbsFinalProduct;
+    }
     if (message.audit !== undefined) {
       obj.audit = AuditInfo.toJSON(message.audit);
     }
@@ -11812,6 +14514,11 @@ export const MBSpin: MessageFns<MBSpin> = {
     message.mbsDozing = object.mbsDozing ?? undefined;
     message.mbsMbCosting = object.mbsMbCosting ?? "";
     message.mbsIsActive = object.mbsIsActive ?? false;
+    message.mbsCc = object.mbsCc ?? undefined;
+    message.mbsCostRateMkt = object.mbsCostRateMkt ?? undefined;
+    message.mbsStatus = object.mbsStatus ?? undefined;
+    message.mbsLdrPrsn = object.mbsLdrPrsn ?? undefined;
+    message.mbsFinalProduct = object.mbsFinalProduct ?? undefined;
     message.audit = (object.audit !== undefined && object.audit !== null)
       ? AuditInfo.fromPartial(object.audit)
       : undefined;
@@ -11828,6 +14535,11 @@ function createBaseCreateMBSpinRequest(): CreateMBSpinRequest {
     mbsFilament: undefined,
     mbsDozing: undefined,
     mbsMbCosting: undefined,
+    mbsCc: undefined,
+    mbsCostRateMkt: undefined,
+    mbsStatus: undefined,
+    mbsLdrPrsn: undefined,
+    mbsFinalProduct: undefined,
   };
 }
 
@@ -11854,6 +14566,21 @@ export const CreateMBSpinRequest: MessageFns<CreateMBSpinRequest> = {
     if (message.mbsMbCosting !== undefined) {
       writer.uint32(58).string(message.mbsMbCosting);
     }
+    if (message.mbsCc !== undefined) {
+      writer.uint32(66).string(message.mbsCc);
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      writer.uint32(73).double(message.mbsCostRateMkt);
+    }
+    if (message.mbsStatus !== undefined) {
+      writer.uint32(82).string(message.mbsStatus);
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      writer.uint32(89).double(message.mbsLdrPrsn);
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      writer.uint32(98).string(message.mbsFinalProduct);
+    }
     return writer;
   },
 
@@ -11920,6 +14647,46 @@ export const CreateMBSpinRequest: MessageFns<CreateMBSpinRequest> = {
           message.mbsMbCosting = reader.string();
           continue;
         }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+
+          message.mbsCc = reader.string();
+          continue;
+        }
+        case 9: {
+          if (tag !== 73) {
+            break;
+          }
+
+          message.mbsCostRateMkt = reader.double();
+          continue;
+        }
+        case 10: {
+          if (tag !== 82) {
+            break;
+          }
+
+          message.mbsStatus = reader.string();
+          continue;
+        }
+        case 11: {
+          if (tag !== 89) {
+            break;
+          }
+
+          message.mbsLdrPrsn = reader.double();
+          continue;
+        }
+        case 12: {
+          if (tag !== 98) {
+            break;
+          }
+
+          message.mbsFinalProduct = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -11966,6 +14733,31 @@ export const CreateMBSpinRequest: MessageFns<CreateMBSpinRequest> = {
         : isSet(object.mbs_mb_costing)
         ? globalThis.String(object.mbs_mb_costing)
         : undefined,
+      mbsCc: isSet(object.mbsCc)
+        ? globalThis.String(object.mbsCc)
+        : isSet(object.mbs_cc)
+        ? globalThis.String(object.mbs_cc)
+        : undefined,
+      mbsCostRateMkt: isSet(object.mbsCostRateMkt)
+        ? globalThis.Number(object.mbsCostRateMkt)
+        : isSet(object.mbs_cost_rate_mkt)
+        ? globalThis.Number(object.mbs_cost_rate_mkt)
+        : undefined,
+      mbsStatus: isSet(object.mbsStatus)
+        ? globalThis.String(object.mbsStatus)
+        : isSet(object.mbs_status)
+        ? globalThis.String(object.mbs_status)
+        : undefined,
+      mbsLdrPrsn: isSet(object.mbsLdrPrsn)
+        ? globalThis.Number(object.mbsLdrPrsn)
+        : isSet(object.mbs_ldr_prsn)
+        ? globalThis.Number(object.mbs_ldr_prsn)
+        : undefined,
+      mbsFinalProduct: isSet(object.mbsFinalProduct)
+        ? globalThis.String(object.mbsFinalProduct)
+        : isSet(object.mbs_final_product)
+        ? globalThis.String(object.mbs_final_product)
+        : undefined,
     };
   },
 
@@ -11992,6 +14784,21 @@ export const CreateMBSpinRequest: MessageFns<CreateMBSpinRequest> = {
     if (message.mbsMbCosting !== undefined) {
       obj.mbsMbCosting = message.mbsMbCosting;
     }
+    if (message.mbsCc !== undefined) {
+      obj.mbsCc = message.mbsCc;
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      obj.mbsCostRateMkt = message.mbsCostRateMkt;
+    }
+    if (message.mbsStatus !== undefined) {
+      obj.mbsStatus = message.mbsStatus;
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      obj.mbsLdrPrsn = message.mbsLdrPrsn;
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      obj.mbsFinalProduct = message.mbsFinalProduct;
+    }
     return obj;
   },
 
@@ -12007,6 +14814,11 @@ export const CreateMBSpinRequest: MessageFns<CreateMBSpinRequest> = {
     message.mbsFilament = object.mbsFilament ?? undefined;
     message.mbsDozing = object.mbsDozing ?? undefined;
     message.mbsMbCosting = object.mbsMbCosting ?? undefined;
+    message.mbsCc = object.mbsCc ?? undefined;
+    message.mbsCostRateMkt = object.mbsCostRateMkt ?? undefined;
+    message.mbsStatus = object.mbsStatus ?? undefined;
+    message.mbsLdrPrsn = object.mbsLdrPrsn ?? undefined;
+    message.mbsFinalProduct = object.mbsFinalProduct ?? undefined;
     return message;
   },
 };
@@ -12261,6 +15073,11 @@ function createBaseUpdateMBSpinRequest(): UpdateMBSpinRequest {
     mbsDozing: undefined,
     mbsMbCosting: undefined,
     mbsIsActive: undefined,
+    mbsCc: undefined,
+    mbsCostRateMkt: undefined,
+    mbsStatus: undefined,
+    mbsLdrPrsn: undefined,
+    mbsFinalProduct: undefined,
   };
 }
 
@@ -12290,6 +15107,21 @@ export const UpdateMBSpinRequest: MessageFns<UpdateMBSpinRequest> = {
     if (message.mbsIsActive !== undefined) {
       writer.uint32(64).bool(message.mbsIsActive);
     }
+    if (message.mbsCc !== undefined) {
+      writer.uint32(74).string(message.mbsCc);
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      writer.uint32(81).double(message.mbsCostRateMkt);
+    }
+    if (message.mbsStatus !== undefined) {
+      writer.uint32(90).string(message.mbsStatus);
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      writer.uint32(97).double(message.mbsLdrPrsn);
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      writer.uint32(106).string(message.mbsFinalProduct);
+    }
     return writer;
   },
 
@@ -12364,6 +15196,46 @@ export const UpdateMBSpinRequest: MessageFns<UpdateMBSpinRequest> = {
           message.mbsIsActive = reader.bool();
           continue;
         }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+
+          message.mbsCc = reader.string();
+          continue;
+        }
+        case 10: {
+          if (tag !== 81) {
+            break;
+          }
+
+          message.mbsCostRateMkt = reader.double();
+          continue;
+        }
+        case 11: {
+          if (tag !== 90) {
+            break;
+          }
+
+          message.mbsStatus = reader.string();
+          continue;
+        }
+        case 12: {
+          if (tag !== 97) {
+            break;
+          }
+
+          message.mbsLdrPrsn = reader.double();
+          continue;
+        }
+        case 13: {
+          if (tag !== 106) {
+            break;
+          }
+
+          message.mbsFinalProduct = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -12415,6 +15287,31 @@ export const UpdateMBSpinRequest: MessageFns<UpdateMBSpinRequest> = {
         : isSet(object.mbs_is_active)
         ? globalThis.Boolean(object.mbs_is_active)
         : undefined,
+      mbsCc: isSet(object.mbsCc)
+        ? globalThis.String(object.mbsCc)
+        : isSet(object.mbs_cc)
+        ? globalThis.String(object.mbs_cc)
+        : undefined,
+      mbsCostRateMkt: isSet(object.mbsCostRateMkt)
+        ? globalThis.Number(object.mbsCostRateMkt)
+        : isSet(object.mbs_cost_rate_mkt)
+        ? globalThis.Number(object.mbs_cost_rate_mkt)
+        : undefined,
+      mbsStatus: isSet(object.mbsStatus)
+        ? globalThis.String(object.mbsStatus)
+        : isSet(object.mbs_status)
+        ? globalThis.String(object.mbs_status)
+        : undefined,
+      mbsLdrPrsn: isSet(object.mbsLdrPrsn)
+        ? globalThis.Number(object.mbsLdrPrsn)
+        : isSet(object.mbs_ldr_prsn)
+        ? globalThis.Number(object.mbs_ldr_prsn)
+        : undefined,
+      mbsFinalProduct: isSet(object.mbsFinalProduct)
+        ? globalThis.String(object.mbsFinalProduct)
+        : isSet(object.mbs_final_product)
+        ? globalThis.String(object.mbs_final_product)
+        : undefined,
     };
   },
 
@@ -12444,6 +15341,21 @@ export const UpdateMBSpinRequest: MessageFns<UpdateMBSpinRequest> = {
     if (message.mbsIsActive !== undefined) {
       obj.mbsIsActive = message.mbsIsActive;
     }
+    if (message.mbsCc !== undefined) {
+      obj.mbsCc = message.mbsCc;
+    }
+    if (message.mbsCostRateMkt !== undefined) {
+      obj.mbsCostRateMkt = message.mbsCostRateMkt;
+    }
+    if (message.mbsStatus !== undefined) {
+      obj.mbsStatus = message.mbsStatus;
+    }
+    if (message.mbsLdrPrsn !== undefined) {
+      obj.mbsLdrPrsn = message.mbsLdrPrsn;
+    }
+    if (message.mbsFinalProduct !== undefined) {
+      obj.mbsFinalProduct = message.mbsFinalProduct;
+    }
     return obj;
   },
 
@@ -12460,6 +15372,11 @@ export const UpdateMBSpinRequest: MessageFns<UpdateMBSpinRequest> = {
     message.mbsDozing = object.mbsDozing ?? undefined;
     message.mbsMbCosting = object.mbsMbCosting ?? undefined;
     message.mbsIsActive = object.mbsIsActive ?? undefined;
+    message.mbsCc = object.mbsCc ?? undefined;
+    message.mbsCostRateMkt = object.mbsCostRateMkt ?? undefined;
+    message.mbsStatus = object.mbsStatus ?? undefined;
+    message.mbsLdrPrsn = object.mbsLdrPrsn ?? undefined;
+    message.mbsFinalProduct = object.mbsFinalProduct ?? undefined;
     return message;
   },
 };