From 2abe151da004b8d6070e9c0d3bf488c123b4fb3c Mon Sep 17 00:00:00 2001
From: syc0123 <yechul.shin@gmail.com>
Date: Fri, 27 Mar 2026 10:03:41 +0900
Subject: [PATCH] =?UTF-8?q?[RAPID-micro]=20=EA=B8=B0=EB=B3=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 견적요청등록: 3열→4열 2행 (8개 필드 수용)
- 수주통합등록: 2행 4열→3행 3열 (9개 필드 균등 배치)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../estimateAndOrderRegistFormPopup.jsp       | 12 ++++-----
 .../contractMgmt/estimateRegistFormPopup.jsp  | 25 +++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp
index 793814a..3618525 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp
@@ -1675,7 +1675,7 @@
 								</td>
 							</tr>
 							
-							<!-- 두번째 행: 유/무상, 접수일, 환종, 환율 -->
+							<!-- 두번째 행: 유/무상, 접수일, 견적환종 -->
 							<tr>
 								<td class="input_title"><label for="">유/무상 <span style="color:red;">*</span></label></td>
 								<td>
@@ -1696,22 +1696,22 @@
 										${code_map.contract_currency}
 									</select>
 								</td>
+							</tr>
+
+							<!-- 세번째 행: 견적환율, 발주번호, 발주일 -->
+							<tr>
 								<td class="input_title"><label for="">견적환율</label></td>
 								<td>
 									<input type="text" name="exchange_rate" id="exchange_rate" reqTitle="환율" value="${info.EXCHANGE_RATE}" />
 								</td>
-							</tr>
-
-                            <tr>
 								<td class="input_title"><label for="">발주번호</label></td>
 								<td>
 									<input type="text" name="po_no" id="po_no" value="${info.PO_NO}" />
 								</td>
-                                <td class="input_title"><label for="">발주일 <span style="color:red;">*</span></label></td>
+								<td class="input_title"><label for="">발주일 <span style="color:red;">*</span></label></td>
 								<td>
 									<input type="text" class="date_icon" name="order_date" id="order_date" required reqTitle="발주일" value="${info.ORDER_DATE}">
 								</td>
-								<td colspan="4"></td>
 							</tr>
 							<input type="hidden" name="contract_result" id="contract_result" value="${info.CONTRACT_RESULT}" />
 						</table>
diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
index 2aaac3c..adf5cd8 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
@@ -2191,15 +2191,17 @@
 						<td>
 							<table class="pmsPopuptable">
 								<colgroup>
-									<col width="12%" />
-									<col width="21%" />
-									<col width="12%" />
-									<col width="21%" />
-									<col width="12%" />
-									<col width="22%" />
+									<col width="11%" />
+									<col width="14%" />
+									<col width="11%" />
+									<col width="14%" />
+									<col width="11%" />
+									<col width="14%" />
+									<col width="11%" />
+									<col width="13%" />
 								</colgroup>
 								
-								<!-- 첫번째 행: 주문유형, 국내/해외, 고객사 -->
+								<!-- 첫번째 행: 주문유형, 국내/해외, 고객사, 유/무상 -->
 								<tr>
 									<td class="input_title"><label for="">주문유형 <span style="color:red;">*</span></label></td>
 									<td>
@@ -2231,10 +2233,6 @@
 											${code_map.customer_cd}
 										</select>
 									</td>
-								</tr>
-								
-								<!-- 두번째 행: 유/무상, 접수일, 환종, 환율 -->
-								<tr>
 									<td class="input_title"><label for="">유/무상 <span style="color:red;">*</span></label></td>
 									<td>
 										<select name="paid_type" id="paid_type" reqTitle="유/무상" type="select" class="select2">
@@ -2243,6 +2241,10 @@
 											<option value="free" ${info.PAID_TYPE eq 'free' ? 'selected' : ''}>무상</option>
 										</select>
 									</td>
+								</tr>
+
+								<!-- 두번째 행: 접수일, 환종, 환율 -->
+								<tr>
 									<td class="input_title"><label for="">접수일 <span style="color:red;">*</span></label></td>
 									<td>
 										<input type="text" class="date_icon" name="receipt_date" id="receipt_date" reqTitle="접수일" value="${info.RECEIPT_DATE}" required>
@@ -2258,6 +2260,7 @@
 									<td>
 										<input type="text" name="exchange_rate" id="exchange_rate" reqTitle="환율" value="${info.EXCHANGE_RATE}" numberOnly />
 									</td>
+									<td colspan="2"></td>
 								</tr>
 								
 								<!-- 세번째 행: 결재여부 -->