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

2 files changed, 33 insertions, 6 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,
+    },
   ]
 
   // ----------------------------------------------------------------
diff --git a/lib/material-groups/table/material-group-table.tsx b/lib/material-groups/table/material-group-table.tsx
index 766b5054..a5617e9b 100644
--- a/lib/material-groups/table/material-group-table.tsx
+++ b/lib/material-groups/table/material-group-table.tsx
@@ -20,7 +20,8 @@ import { ViewModeToggle } from "@/components/data-table/view-mode-toggle"
 // MaterialGroup 타입 정의 (서비스에서 반환되는 타입과 일치)
 type MaterialGroup = {
   materialGroupCode: string | null;
-  materialGroupDesc: string | null;
+  materialGroupDescription: string | null;
+  materialGroupUom?: string | null;
 }
 
 interface MaterialGroupTableProps {
@@ -50,9 +51,13 @@ export function MaterialGroupTable({ promises }: MaterialGroupTableProps) {
       label: "자재그룹코드",
     },
     {
-      id: "materialGroupDesc",
+      id: "materialGroupDescription",
       label: "자재그룹명",
     },
+    {
+      id: "materialGroupUom",
+      label: "UOM",
+    },
   ]
 
   const advancedFilterFields: DataTableAdvancedFilterField<MaterialGroup>[] = [
@@ -62,10 +67,15 @@ export function MaterialGroupTable({ promises }: MaterialGroupTableProps) {
       type: "text",
     },
     {
-      id: "materialGroupDesc",
+      id: "materialGroupDescription",
       label: "자재그룹명",
       type: "text",
     },
+    {
+      id: "materialGroupUom",
+      label: "UOM",
+      type: "text",
+    },
   ]
 
   // 확장된 useDataTable 훅 사용 (pageSize 기반 자동 전환)