From 6c912b1e98b024bbccf1ff46a92580516b533783 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Wed, 6 May 2026 14:35:03 +0900
Subject: [PATCH] =?UTF-8?q?[1496]=20=E6=97=A7=E8=A6=8B=E7=A9=8D=E6=9B=B8?=
 =?UTF-8?q?=E6=9B=B8=E5=BC=8F=20=EC=B6=9C=EB=A0=A5=20=EC=8B=9C=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=B4/=EC=8B=9C=EB=AE=AC/=EC=A4=91=EB=9F=89=ED=91=9C=20?=
 =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EB=8F=99=EC=8B=9C=20=EC=B6=9C=EB=A0=A5=20?=
 =?UTF-8?q?=EC=A7=80=EC=9B=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
index 457d6167..02de114a 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -1912,19 +1912,20 @@ public class EstimateService {
           safeRemoveSheet(workbook, "特異事項");
         }
 
+        // 2026-05-06 신/구 견적서 양식에 따른 견적서 시트만 교체.
+        //   schDrawingFlg / schWeightFlg(위쪽 분기)로 선택된 부속 시트
+        //   (割付図・系統図 / 架台図 / 発電シミュレーション / 重量算出シート 등)는 그대로 유지한다.
         if ("EXCEL2".equals(estimateRequest.getSchDownload())) {
+          // 旧見積書書式: 신 양식 견적서 시트(見積書) 제거 후, 구 양식(見積書.)을 맨 앞으로 이동
           safeRemoveSheet(workbook, "見積書");
-          safeRemoveSheet(workbook, "特異事項");
-          safeRemoveSheet(workbook, "発電シミュレーション");
-          safeRemoveSheet(workbook, "割付図・系統図");
-          safeRemoveSheet(workbook, "架台図");
-          safeRemoveSheet(workbook, "重量算出シート");
-          safeRemoveSheet(workbook, "P1");
-          safeRemoveSheet(workbook, "P2");
-        }else{
-          safeRemoveSheet(workbook,"見積書.");
-          safeRemoveSheet(workbook, "特異事項");
+          if (workbook.getSheetIndex("見積書.") > 0) {
+            workbook.setSheetOrder("見積書.", 0);
+          }
+        } else {
+          // 신(통상) 견적서 양식: 구 양식 견적서 시트(見積書.)만 제거
+          safeRemoveSheet(workbook, "見積書.");
         }
+        safeRemoveSheet(workbook, "特異事項");
 
         applyExcelNumberFormat(workbook);
 //        applyExcelFixedNumberFormat(workbook, Arrays.asList("H25", "C12"), "#,##0.00");