From e19a28fa52511448d7095638038c03688f8589e0 Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Thu, 22 Jan 2026 09:59:20 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=EC=97=90=EC=84=9C=20=EA=B3=B5=EA=B8=89=EC=97=85?=
 =?UTF-8?q?=EC=B2=B4=20=EB=AA=85=EC=9D=B4=20=EC=95=88=EB=93=A4=EC=96=B4?=
 =?UTF-8?q?=EA=B0=80=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/ExcelUploadModal.tsx    | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/frontend/components/common/ExcelUploadModal.tsx b/frontend/components/common/ExcelUploadModal.tsx
index 64fe38b8..cddbb73f 100644
--- a/frontend/components/common/ExcelUploadModal.tsx
+++ b/frontend/components/common/ExcelUploadModal.tsx
@@ -928,12 +928,39 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
                         {field.inputType === "entity" ? (
                           <Select
                             value={masterFieldValues[field.columnName]?.toString() || ""}
-                            onValueChange={(value) =>
-                              setMasterFieldValues((prev) => ({
-                                ...prev,
-                                [field.columnName]: value,
-                              }))
-                            }
+                            onValueChange={(value) => {
+                              // 선택한 item 찾기
+                              const selectedItem = entitySearchData[field.columnName]?.find(
+                                (item: any) => item[field.referenceColumn || "id"]?.toString() === value
+                              );
+                              
+                              // displayColumn에서 name 값도 가져오기
+                              const displayColName = 
+                                field.displayColumn || 
+                                entityDisplayColumns[field.columnName] || 
+                                field.referenceColumn || 
+                                "id";
+                              const displayValue = selectedItem?.[displayColName];
+                              
+                              // code와 name 컬럼명 추출 (예: supplier_code → supplier_name)
+                              const codeColName = field.columnName; // supplier_code
+                              const nameColName = codeColName.replace(/_code$/, "_name"); // supplier_name
+                              
+                              setMasterFieldValues((prev) => {
+                                const newValues = {
+                                  ...prev,
+                                  [codeColName]: value,
+                                };
+                                
+                                // _code로 끝나는 컬럼이면 _name도 함께 저장
+                                if (codeColName.endsWith("_code") && displayValue) {
+                                  newValues[nameColName] = displayValue;
+                                  console.log(`🔗 엔티티 연동: ${codeColName}=${value}, ${nameColName}=${displayValue}`);
+                                }
+                                
+                                return newValues;
+                              });
+                            }}
                           >
                             <SelectTrigger className="h-9 text-xs">
                               <SelectValue placeholder={`${field.columnLabel} 선택`} />