From e41e3af4e72870d44a94b03e0f3246d6ccaaca48 Mon Sep 17 00:00:00 2001
From: joonhoekim <26rote@gmail.com>
Date: Mon, 29 Sep 2025 21:22:00 +0900
Subject: (김준회) RFQ PR 아이템 dialog 및 견적히스토리 구매요구사항 반영 1.
 RFQ PR 아이템 dialog: 주요 품목 카드 및 개수 표시 제거, 컬럼명 변경 2.
 견적히스토리: where condition 누락건 처리
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/rfq-last/table/rfq-items-dialog.tsx | 12 ++++++------
 lib/vendors/service.ts                  | 10 ++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/rfq-last/table/rfq-items-dialog.tsx b/lib/rfq-last/table/rfq-items-dialog.tsx
index 466bcbd6..c640f3bd 100644
--- a/lib/rfq-last/table/rfq-items-dialog.tsx
+++ b/lib/rfq-last/table/rfq-items-dialog.tsx
@@ -182,15 +182,15 @@ export function RfqItemsDialog({ isOpen, onClose, rfqData }: RfqItemsDialogProps
         {/* 통계 정보 */}
         {statistics && !isLoading && (
           <>
-<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-5 gap-3 py-3">
+<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-3 py-3">
 <div className="text-center">
                 <div className="text-2xl font-bold text-primary">{statistics.total}</div>
                 <div className="text-xs text-muted-foreground">전체 품목</div>
               </div>
-              <div className="text-center">
+              {/* <div className="text-center">
                 <div className="text-2xl font-bold text-blue-600">{statistics.major}</div>
                 <div className="text-xs text-muted-foreground">주요 품목</div>
-              </div>
+              </div> */}
               <div className="text-center">
                 <div className="text-2xl font-bold text-gray-600">{statistics.regular}</div>
                 <div className="text-xs text-muted-foreground">일반 품목</div>
@@ -213,7 +213,7 @@ export function RfqItemsDialog({ isOpen, onClose, rfqData }: RfqItemsDialogProps
             <Table>
               <TableHeader>
                 <TableRow>
-                  <TableHead className="w-[60px]">구분</TableHead>
+                  <TableHead className="w-[60px]">아이템</TableHead>
                   <TableHead className="w-[120px]">자재코드</TableHead>
                   <TableHead>자재명</TableHead>
                   <TableHead className="w-[80px]">수량</TableHead>
@@ -255,7 +255,7 @@ export function RfqItemsDialog({ isOpen, onClose, rfqData }: RfqItemsDialogProps
             <Table>
               <TableHeader>
                 <TableRow>
-                  <TableHead className="w-[60px]">구분</TableHead>
+                  <TableHead className="w-[60px]">아이템</TableHead>
                   <TableHead className="w-[120px]">자재코드</TableHead>
                   <TableHead>자재명</TableHead>
                   <TableHead className="w-[80px]">수량</TableHead>
@@ -426,7 +426,7 @@ export function RfqItemsDialog({ isOpen, onClose, rfqData }: RfqItemsDialogProps
             <div className="flex justify-between items-center">
               <span>
                 총 {statistics.total}개 품목 
-                (주요: {statistics.major}개, 일반: {statistics.regular}개)
+                {/* (주요: {statistics.major}개, 일반: {statistics.regular}개) */}
               </span>
               <span>
                 전체 수량: {statistics.totalQuantity.toLocaleString()} | 
diff --git a/lib/vendors/service.ts b/lib/vendors/service.ts
index e6a2a139..6132832f 100644
--- a/lib/vendors/service.ts
+++ b/lib/vendors/service.ts
@@ -1396,10 +1396,7 @@ export async function getRfqHistory(input: GetRfqHistorySchema, vendorId: number
         ))
         .leftJoin(rfqLastDetails, eq(rfqLastVendorResponses.rfqLastDetailsId, rfqLastDetails.id))
         .leftJoin(projects, eq(rfqsLast.projectId, projects.id))
-        .where(and(
-          advancedWhere,
-          globalWhere
-        ))
+        .where(finalWhere)
         .orderBy(...orderBy)
         .limit(input.perPage)
         .offset(offset);
@@ -1449,10 +1446,7 @@ export async function getRfqHistory(input: GetRfqHistorySchema, vendorId: number
         ))
         .leftJoin(rfqLastDetails, eq(rfqLastVendorResponses.rfqLastDetailsId, rfqLastDetails.id))
         .leftJoin(projects, eq(rfqsLast.projectId, projects.id))
-        .where(and(
-          advancedWhere,
-          globalWhere
-        ));
+        .where(finalWhere);
 
       const totalCount = total[0]?.count ?? 0;
       logger.debug({ totalCount }, "RFQ history total count");
-- 
cgit v1.2.3