Merge remote-tracking branch 'origin/dujinkim' into master_homemaster

1 files changed, 21 insertions, 6 deletions

diff --git a/lib/bidding/vendor/components/pr-items-pricing-table.tsx b/lib/bidding/vendor/components/pr-items-pricing-table.tsx
index 483bce5c..efa10af2 100644
--- a/lib/bidding/vendor/components/pr-items-pricing-table.tsx
+++ b/lib/bidding/vendor/components/pr-items-pricing-table.tsx
@@ -32,16 +32,27 @@ import {
 
 interface PrItem {
   id: number
+  biddingId: number
   itemNumber: string | null
-  prNumber: string | null
+  projectId: number | null
+  projectInfo: string | null
   itemInfo: string | null
-  materialDescription: string | null
+  shi: string | null
+  materialGroupNumber: string | null
+  materialGroupInfo: string | null
+  materialNumber: string | null
+  materialInfo: string | null
+  requestedDeliveryDate: Date | null
+  annualUnitPrice: string | null
+  currency: string | null
   quantity: string | null
   quantityUnit: string | null
   totalWeight: string | null
   weightUnit: string | null
-  currency: string | null
-  requestedDeliveryDate: string | null
+  priceUnit: string | null
+  purchaseUnit: string | null
+  materialWeight: string | null
+  prNumber: string | null
   hasSpecDocument: boolean | null
 }
 
@@ -283,8 +294,10 @@ export function PrItemsPricingTable({
                   <TableHead>자재내역</TableHead>
                   <TableHead>수량</TableHead>
                   <TableHead>단위</TableHead>
+                  <TableHead>구매단위</TableHead>
                   <TableHead>중량</TableHead>
                   <TableHead>중량단위</TableHead>
+                  <TableHead>가격단위</TableHead>
                   <TableHead>SHI 납품요청일</TableHead>
                   <TableHead>견적단가</TableHead>
                   <TableHead>견적금액</TableHead>
@@ -315,18 +328,20 @@ export function PrItemsPricingTable({
                         </div>
                       </TableCell>
                       <TableCell>
-                        <div className="max-w-32 truncate" title={item.materialDescription || ''}>
-                          {item.materialDescription || '-'}
+                        <div className="max-w-32 truncate" title={item.materialInfo || ''}>
+                          {item.materialInfo || '-'}
                         </div>
                       </TableCell>
                       <TableCell className="text-right">
                         {item.quantity ? parseFloat(item.quantity).toLocaleString() : '-'}
                       </TableCell>
                       <TableCell>{item.quantityUnit || '-'}</TableCell>
+                      <TableCell>{item.purchaseUnit || '-'}</TableCell>
                       <TableCell className="text-right">
                         {item.totalWeight ? parseFloat(item.totalWeight).toLocaleString() : '-'}
                       </TableCell>
                       <TableCell>{item.weightUnit || '-'}</TableCell>
+                      <TableCell>{item.priceUnit || '-'}</TableCell>
                       <TableCell>
                         {item.requestedDeliveryDate ? 
                           formatDate(item.requestedDeliveryDate, 'KR') : '-'