Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management

backend-node/src/controllers/DashboardController.ts

@@ -41,6 +41,7 @@ export class DashboardController {
         isPublic = false,
         tags,
         category,
+        settings,
       }: CreateDashboardRequest = req.body;
 
       // 유효성 검증
@@ -85,6 +86,7 @@ export class DashboardController {
         elements,
         tags,
         category,
+        settings,
       };
 
       // console.log('대시보드 생성 시작:', { title: dashboardData.title, userId, elementsCount: elements.length });

backend-node/src/controllers/orderController.ts

@@ -165,7 +165,7 @@ export async function createOrder(req: AuthenticatedRequest, res: Response) {
 }
 
 /**
- * 수주 목록 조회 API
+ * 수주 목록 조회 API (마스터 + 품목 JOIN)
  * GET /api/orders
  */
 export async function getOrders(req: AuthenticatedRequest, res: Response) {
@@ -184,14 +184,14 @@ export async function getOrders(req: AuthenticatedRequest, res: Response) {
 
     // 멀티테넌시 (writer 필드에 company_code 포함)
     if (companyCode !== "*") {
-      whereConditions.push(`writer LIKE $${paramIndex}`);
+      whereConditions.push(`m.writer LIKE $${paramIndex}`);
       params.push(`%${companyCode}%`);
       paramIndex++;
     }
 
     // 검색
     if (searchText) {
-      whereConditions.push(`objid LIKE $${paramIndex}`);
+      whereConditions.push(`m.objid LIKE $${paramIndex}`);
       params.push(`%${searchText}%`);
       paramIndex++;
     }
@@ -201,16 +201,47 @@ export async function getOrders(req: AuthenticatedRequest, res: Response) {
         ? `WHERE ${whereConditions.join(" AND ")}`
         : "";
 
-    // 카운트 쿼리
-    const countQuery = `SELECT COUNT(*) as count FROM order_mng_master ${whereClause}`;
+    // 카운트 쿼리 (고유한 수주 개수)
+    const countQuery = `
+      SELECT COUNT(DISTINCT m.objid) as count 
+      FROM order_mng_master m
+      ${whereClause}
+    `;
     const countResult = await pool.query(countQuery, params);
     const total = parseInt(countResult.rows[0]?.count || "0");
 
-    // 데이터 쿼리
+    // 데이터 쿼리 (마스터 + 품목 JOIN)
     const dataQuery = `
-      SELECT * FROM order_mng_master
+      SELECT 
+        m.objid as order_no,
+        m.partner_objid,
+        m.final_delivery_date,
+        m.reason,
+        m.status,
+        m.reg_date,
+        m.writer,
+        COALESCE(
+          json_agg(
+            CASE WHEN s.objid IS NOT NULL THEN
+              json_build_object(
+                'sub_objid', s.objid,
+                'part_objid', s.part_objid,
+                'partner_price', s.partner_price,
+                'partner_qty', s.partner_qty,
+                'delivery_date', s.delivery_date,
+                'status', s.status,
+                'regdate', s.regdate
+              )
+            END
+            ORDER BY s.regdate
+          ) FILTER (WHERE s.objid IS NOT NULL),
+          '[]'::json
+        ) as items
+      FROM order_mng_master m
+      LEFT JOIN order_mng_sub s ON m.objid = s.order_mng_master_objid
       ${whereClause}
-      ORDER BY reg_date DESC
+      GROUP BY m.objid, m.partner_objid, m.final_delivery_date, m.reason, m.status, m.reg_date, m.writer
+      ORDER BY m.reg_date DESC
       LIMIT $${paramIndex} OFFSET $${paramIndex + 1}
     `;
 
@@ -219,6 +250,13 @@ export async function getOrders(req: AuthenticatedRequest, res: Response) {
 
     const dataResult = await pool.query(dataQuery, params);
 
+    logger.info("수주 목록 조회 성공", {
+      companyCode,
+      total,
+      page: parseInt(page as string),
+      itemCount: dataResult.rows.length,
+    });
+
     res.json({
       success: true,
       data: dataResult.rows,