Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 20 insertions, 3 deletions

diff --git a/lib/material-groups/table/material-group-table-columns.tsx b/lib/material-groups/table/material-group-table-columns.tsx
index 08e730e3..f41ed887 100644
--- a/lib/material-groups/table/material-group-table-columns.tsx
+++ b/lib/material-groups/table/material-group-table-columns.tsx
@@ -8,7 +8,8 @@ import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table-
 // MaterialGroup 타입 정의 (서비스에서 반환되는 타입과 일치)
 type MaterialGroup = {
   materialGroupCode: string | null;
-  materialGroupDesc: string | null;
+  materialGroupDescription: string | null;
+  materialGroupUom?: string | null;
 }
 
 /**
@@ -36,12 +37,12 @@ export function getColumns(): ColumnDef<MaterialGroup>[] {
       enableHiding: false,
     },
     {
-      accessorKey: "materialGroupDesc",
+      accessorKey: "materialGroupDescription",
       header: ({ column }) => (
         <DataTableColumnHeaderSimple column={column} title="자재그룹명" />
       ),
       cell: ({ row }) => {
-        const value = row.getValue("materialGroupDesc") as string | null
+        const value = row.getValue("materialGroupDescription") as string | null
         return (
           <div className="max-w-[400px] truncate">
             {value || "-"}
@@ -51,6 +52,22 @@ export function getColumns(): ColumnDef<MaterialGroup>[] {
       enableSorting: true,
       enableHiding: false,
     },
+    {
+      accessorKey: "materialGroupUom",
+      header: ({ column }) => (
+        <DataTableColumnHeaderSimple column={column} title="UOM" />
+      ),
+      cell: ({ row }) => {
+        const value = row.getValue("materialGroupUom") as string | null
+        return (
+          <div className="max-w-[80px] truncate">
+            {value || "-"}
+          </div>
+        )
+      },
+      enableSorting: true,
+      enableHiding: false,
+    },
   ]
 
   // ----------------------------------------------------------------