(김준회) dolce: 1) 도면리스트 테이블에 상세도면수 컬럼 추가, 2) 상세도면편집 API 호출시 부모 도면의 ManagerNo를 Manager에 넣어서 보내도록 수정

6 files changed, 28 insertions, 6 deletions

diff --git a/i18n/locales/en/dolce.json b/i18n/locales/en/dolce.json
index c198086d..ba3c7d4f 100644
--- a/i18n/locales/en/dolce.json
+++ b/i18n/locales/en/dolce.json
@@ -33,6 +33,7 @@
       "drawingNo": "Drawing No",
       "drawingName": "Drawing Name",
       "discipline": "Discipline",
+      "detailDwgCnt": "Detail Count",
       "manager": "Manager",
       "category": "Category",
       "appDwgPlanDate": "Approval Dwg Plan Date",
diff --git a/i18n/locales/ko/dolce.json b/i18n/locales/ko/dolce.json
index 4390a416..10748b76 100644
--- a/i18n/locales/ko/dolce.json
+++ b/i18n/locales/ko/dolce.json
@@ -33,6 +33,7 @@
       "drawingNo": "도면번호",
       "drawingName": "도면명",
       "discipline": "설계공종",
+      "detailDwgCnt": "상세도면 수",
       "manager": "담당자명",
       "category": "구분",
       "appDwgPlanDate": "승인도면 예정일",
diff --git a/lib/dolce/actions.ts b/lib/dolce/actions.ts
index 501c6cb0..fe246956 100644
--- a/lib/dolce/actions.ts
+++ b/lib/dolce/actions.ts
@@ -20,6 +20,7 @@ export interface DwgReceiptItem {
   CreateUserENM: string | null;
   CreateUserId: string | null;
   CreateUserNo: string;
+  DetailDwgCNT: number;
   Discipline: string;
   DrawingKind: string;
   DrawingMoveGbn: string;
@@ -44,6 +45,7 @@ export interface GttDwgReceiptItem {
   CreateUserENM: string;
   CreateUserId: string;
   CreateUserNo: string;
+  DetailDwgCNT: number;
   DGbn: string | null;
   DegreeGbn: string | null;
   DeptGbn: string | null;
@@ -946,7 +948,7 @@ export async function prepareB4DetailDrawingsV2(params: {
             DrawingRevNo: revNo,
             Category: category,
             Receiver: null,
-            Manager: drawingInfo.Manager || "970043",
+            Manager: drawingInfo.ManagerNo,
             RegisterDesc: "",
             UploadId: uploadId,
             RegCompanyCode: vendorCode,
@@ -1188,7 +1190,7 @@ export async function bulkUploadB4FilesV2(
             DrawingRevNo: revNo,
             Category: category,
             Receiver: null,
-            Manager: drawingInfo.Manager || "970043",
+            Manager: drawingInfo.ManagerNo,
             RegisterDesc: registerDesc,
             UploadId: uploadId,
             RegCompanyCode: vendorCode,
diff --git a/lib/dolce/dialogs/add-and-modify-detail-drawing-dialog.tsx b/lib/dolce/dialogs/add-and-modify-detail-drawing-dialog.tsx
index d4318b90..2d2532d7 100644
--- a/lib/dolce/dialogs/add-and-modify-detail-drawing-dialog.tsx
+++ b/lib/dolce/dialogs/add-and-modify-detail-drawing-dialog.tsx
@@ -272,7 +272,7 @@ export function AddAndModifyDetailDrawingDialog({
               DrawingRevNo: drawingUsage === "CMT" ? null : revision,
               Category: "TS", // To SHI (벤더가 SHI에게 제출)
               Receiver: null,
-              Manager: "",
+              Manager: drawing.ManagerNo,
               RegisterDesc: comment,
               UploadId: uploadId,
               RegCompanyCode: vendorCode,
diff --git a/lib/dolce/table/drawing-list-columns.tsx b/lib/dolce/table/drawing-list-columns.tsx
index 30b71d8d..6fe1b3e2 100644
--- a/lib/dolce/table/drawing-list-columns.tsx
+++ b/lib/dolce/table/drawing-list-columns.tsx
@@ -28,12 +28,21 @@ export function drawingListColumns(lng: string, t: any): ColumnDef<DwgReceiptIte
       minSize: 120,
     },
     {
+      accessorKey: "DetailDwgCNT",
+      header: t("drawingList.columns.detailDwgCnt"),
+      minSize: 100,
+      cell: ({ row }) => {
+        const count = row.getValue("DetailDwgCNT") as number;
+        return <div className="text-center">{count || 0}</div>;
+      },
+    },
+    {
       accessorKey: "Manager",
       header: t("drawingList.columns.manager"),
       minSize: 200,
       cell: ({ row }) => {
         const managerENM = row.original.ManagerENM;
-        const manager = row.getValue("Manager");
+        const manager = row.getValue("Manager") as string;
         return <div>{managerENM || manager}</div>;
       },
     },
diff --git a/lib/dolce/table/gtt-drawing-list-columns.tsx b/lib/dolce/table/gtt-drawing-list-columns.tsx
index 94d4d7d1..c76fcba0 100644
--- a/lib/dolce/table/gtt-drawing-list-columns.tsx
+++ b/lib/dolce/table/gtt-drawing-list-columns.tsx
@@ -41,12 +41,21 @@ export function createGttDrawingListColumns({
       minSize: 80,
     },
     {
+      accessorKey: "DetailDwgCNT",
+      header: t("drawingList.columns.detailDwgCnt"),
+      minSize: 100,
+      cell: ({ row }) => {
+        const count = row.getValue("DetailDwgCNT") as number;
+        return <div className="text-center">{count || 0}</div>;
+      },
+    },
+    {
       accessorKey: "Manager",
       header: t("drawingList.columns.manager"),
       minSize: 200,
       cell: ({ row }) => {
         const managerENM = row.original.ManagerENM;
-        const manager = row.getValue("Manager");
+        const manager = row.getValue("Manager") as string;
         return <div>{managerENM || manager}</div>;
       },
     },
@@ -56,7 +65,7 @@ export function createGttDrawingListColumns({
       minSize: 120,
       cell: ({ row }) => {
 
-        const drawingMoveGbn = row.getValue("DrawingMoveGbn");
+        const drawingMoveGbn = row.getValue("DrawingMoveGbn") as string;
         let type = "";
 
         if (drawingMoveGbn == "도면입수") {