From 6022619231312b4797f156e3ad9c493ac99548fe Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Wed, 13 Nov 2024 09:02:50 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EB=B0=B0=EC=B9=98=20=EC=A3=BC=EC=84=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interplug/qcast/batch/system/CommonCodeConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/interplug/qcast/batch/system/CommonCodeConfiguration.java b/src/main/java/com/interplug/qcast/batch/system/CommonCodeConfiguration.java
index 350aa3d5..f4d9936f 100644
--- a/src/main/java/com/interplug/qcast/batch/system/CommonCodeConfiguration.java
+++ b/src/main/java/com/interplug/qcast/batch/system/CommonCodeConfiguration.java
@@ -26,7 +26,7 @@ import com.interplug.qcast.biz.commCode.dto.HeadCodeRequest;
 import com.interplug.qcast.util.InterfaceQsp;
 import lombok.extern.slf4j.Slf4j;
 
-/** 영업사원 동기화 배치 */
+/** 공통코드 동기화 배치 */
 @Configuration
 @Slf4j
 public class CommonCodeConfiguration implements JobExecutionListener {

From 6ad6ce2cd34222ff73278fef80b2993a9bd7a18b Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 13 Nov 2024 09:07:03 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20API=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateMapper.java    |  5 +-
 .../qcast/biz/estimate/EstimateService.java   | 64 ++++++++++++++++--
 .../biz/estimate/dto/EstimateResponse.java    | 12 ++++
 .../estimate/dto/EstimateSendResponse.java    |  3 +
 .../qcast/biz/estimate/dto/ItemRequest.java   |  3 +
 .../biz/estimate/dto/RoofInfoResponse.java    | 20 ++++++
 .../qcast/biz/estimate/dto/RoofResponse.java  | 67 +++++++++++++++++++
 .../mappers/estimate/estimateMapper.xml       | 54 +++++++++++++++
 8 files changed, 222 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
 create mode 100644 src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
index 5e169ed3..8fcc17b6 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
@@ -21,7 +21,10 @@ public interface EstimateMapper {
   // 아이템 마스터 목록 조회
   public List<ItemResponse> selectItemMasterList(EstimateRequest estimateRequest);
 
-  // 아이템 마스터 목록 조회
+  // 견적서 지붕재 목록 조회
+  public List<RoofResponse> selectEstimateRoofList(EstimateRequest estimateRequest);
+
+  // 견적서 특이사항 목록 조회
   public List<NoteResponse> selectEstimateNoteList(NoteRequest noteRequest);
 
   // 아이템 마스터 목록 조회
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 3f2dada3..fb0f62a0 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -10,9 +10,7 @@ import com.interplug.qcast.biz.object.dto.ObjectResponse;
 import com.interplug.qcast.biz.object.dto.PlanRequest;
 import com.interplug.qcast.biz.object.dto.PlanResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.PwrGnrSimService;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimGuideResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimRequest;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimResponse;
 import com.interplug.qcast.config.Exception.ErrorCode;
 import com.interplug.qcast.config.Exception.QcastException;
 import com.interplug.qcast.config.message.Messages;
@@ -115,8 +113,8 @@ public class EstimateService {
   /**
    * QSP 아이템 가격 목록 조회
    *
-   * @param priceRequest
-   * @return PriceResponse
+   * @param priceRequest QSP 관련 아이템 목록 정보
+   * @return PriceResponse QSP 아이템 가격 목록
    * @throws Exception
    */
   public EstimateApiResponse selectItemPriceList(PriceRequest priceRequest) throws Exception {
@@ -156,10 +154,25 @@ public class EstimateService {
     return response;
   }
 
+  /**
+   * 견적 특이사항 목록 조회
+   *
+   * @param noteRequest 견적 특이사항 조회 정보
+   * @return List<NoteResponse> 견적 특이사항 목록
+   * @throws Exception
+   */
   public List<NoteResponse> selectSpecialNoteList(NoteRequest noteRequest) throws Exception {
     return estimateMapper.selectEstimateNoteList(noteRequest);
   }
 
+  /**
+   * 견적서 상세 조회
+   *
+   * @param objectNo 물건번호
+   * @param planNo 플랜번호
+   * @return EstimateResponse 견적서 상세 정보
+   * @throws Exception
+   */
   public EstimateResponse selectEstimateDetail(String objectNo, String planNo) throws Exception {
     // Validation
     if (StringUtils.isEmpty(objectNo)) {
@@ -204,6 +217,12 @@ public class EstimateService {
     return response;
   }
 
+  /**
+   * 견적서 저장
+   *
+   * @param estimateRequest 견적서 저장 정보
+   * @throws Exception
+   */
   public void insertEstimate(EstimateRequest estimateRequest) throws Exception {
     // Validation
     if (StringUtils.isEmpty(estimateRequest.getObjectNo())) {
@@ -522,6 +541,13 @@ public class EstimateService {
     }
   }
 
+  /**
+   * 견적서 복사
+   *
+   * @param estimateRequest 견적서 복사 정보
+   * @return EstimateResponse 견적서 복사 후 상세 정보
+   * @throws Exception
+   */
   public EstimateResponse insertEstimateCopy(EstimateRequest estimateRequest) throws Exception {
     // Validation
     if (StringUtils.isEmpty(estimateRequest.getObjectNo())) {
@@ -613,6 +639,14 @@ public class EstimateService {
     return response;
   }
 
+  /**
+   * 견적서 엑셀 다운로드
+   *
+   * @param request HttpServletRequest
+   * @param response HttpServletResponse
+   * @param estimateRequest 견적서 엑셀 다운로드 요청 정보
+   * @throws Exception
+   */
   public void excelDownload(
       HttpServletRequest request, HttpServletResponse response, EstimateRequest estimateRequest)
       throws Exception {
@@ -648,6 +682,13 @@ public class EstimateService {
         estimateResponse.setNoteList(noteList);
       }
 
+      // 지붕재 목록 조회
+      RoofInfoResponse roofInfoResponse = new RoofInfoResponse();
+      List<RoofResponse> roofList = estimateMapper.selectEstimateRoofList(estimateRequest);
+      roofInfoResponse.setRoofList(roofList);
+
+      estimateResponse.setRoofInfo(roofInfoResponse);
+
       // 아이템 목록 조회
       List<ItemResponse> estimateItemList = estimateMapper.selectEstimateItemList(estimateRequest);
 
@@ -701,7 +742,7 @@ public class EstimateService {
       PwrGnrSimRequest pwrGnrSimRequest = new PwrGnrSimRequest();
       pwrGnrSimRequest.setObjectNo(estimateResponse.getObjectNo());
       pwrGnrSimRequest.setPlanNo(estimateResponse.getPlanNo());
-
+      /*
       PwrGnrSimResponse pwrGnrSimResponse =
           pwrGnrSimService.selectPwrGnrSimulation(pwrGnrSimRequest);
       if (pwrGnrSimResponse != null) {
@@ -719,6 +760,7 @@ public class EstimateService {
       }
 
       estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
+       */
 
       excelUtil.download(
           request,
@@ -911,6 +953,12 @@ public class EstimateService {
     return quoteList;
   }
 
+  /**
+   * Object => Map 변환 함수
+   *
+   * @param vo Object
+   * @return Map<String, Object> Map 변환 정보
+   */
   public Map<String, Object> convertVoToMap(Object vo) {
     Map<String, Object> result = new HashMap<String, Object>();
 
@@ -928,6 +976,12 @@ public class EstimateService {
     return result;
   }
 
+  /**
+   * List<Object> => List<Map> 변환 함수
+   *
+   * @param target List<Object>
+   * @return List<Map<String, Object>> List<Map> 변환 정보
+   */
   public static <T> List<Map<String, Object>> convertListToMap(Collection<T> target) {
     List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
 
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java
index e08d0036..9fd895dc 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java
@@ -80,6 +80,9 @@ public class EstimateResponse {
   @Schema(description = "기준풍속ID")
   private String standardWindSpeedId;
 
+  @Schema(description = "기준풍속명")
+  private String standardWindSpeedName;
+
   @Schema(description = "가대 메이커명")
   private String supportMeaker;
 
@@ -175,6 +178,12 @@ public class EstimateResponse {
   @Schema(description = "경칭")
   private String objectNameOmit;
 
+  @Schema(description = "도도부현명")
+  private String prefName;
+
+  @Schema(description = "지역명")
+  private String areaName;
+
   @Schema(description = "물건정보 비고")
   private String objectRemarks;
 
@@ -235,6 +244,9 @@ public class EstimateResponse {
   @Schema(description = "첨부파일 목록")
   List<FileResponse> fileList;
 
+  @Schema(description = "지붕재 정보")
+  RoofInfoResponse roofInfo;
+
   @Schema(description = "발전시뮬레이션 정보")
   PwrGnrSimResponse pwrGnrSim;
 }
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateSendResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateSendResponse.java
index 50955725..0c0b5aef 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateSendResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateSendResponse.java
@@ -19,6 +19,9 @@ public class EstimateSendResponse {
   @Schema(description = "물건명")
   private String objectName;
 
+  @Schema(description = "경칭코드")
+  private String objectNameOmitCd;
+
   @Schema(description = "견적서 등록일")
   private String estimateDetailCreateDate;
 
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java
index 154ed112..560a7c27 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java
@@ -62,6 +62,9 @@ public class ItemRequest {
   @Schema(description = "아이템 변경 여부")
   private String itemChangeFlg;
 
+  @Schema(description = "PC 아이템 ID")
+  private String pcItemId;
+
   @Schema(description = "W")
   private String pnowW;
 
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
new file mode 100644
index 00000000..3f090e04
--- /dev/null
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
@@ -0,0 +1,20 @@
+package com.interplug.qcast.biz.estimate.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+// @Data
+@Getter
+@Setter
+public class RoofInfoResponse {
+  @Schema(description = "지붕면 목록")
+  private List<RoofResponse> roofList;
+
+  @Schema(description = "지붕면 파워컨디셔너 목록")
+  private List<RoofResponse> roofPcList;
+
+  @Schema(description = "지붕면 용량 목록")
+  private List<RoofResponse> roofVolList;
+}
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
new file mode 100644
index 00000000..e4d131b2
--- /dev/null
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
@@ -0,0 +1,67 @@
+package com.interplug.qcast.biz.estimate.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+// @Data
+@Getter
+@Setter
+public class RoofResponse {
+  @Schema(description = "물건번호")
+  private String objectNo;
+
+  @Schema(description = "플랜번호")
+  private String planNo;
+
+  @Schema(description = "지붕재 번호")
+  private String roofNo;
+
+  @Schema(description = "지붕면")
+  private String roofSurface;
+
+  @Schema(description = "지붕재 아이템 ID")
+  private String roofMaterialId;
+
+  @Schema(description = "지붕재 아이템명")
+  private String roofMaterialName;
+
+  @Schema(description = "공법 ID")
+  private String supportMethodId;
+
+  @Schema(description = "공법명")
+  private String supportMethodName;
+
+  @Schema(description = "시공사양 ID")
+  private String constructSpecification;
+
+  @Schema(description = "시공사양명")
+  private String constructSpecificationName;
+
+  @Schema(description = "지붕재 아이템명")
+  private String roofMaterialIdMulti;
+
+  @Schema(description = "공법명")
+  private String supportMethodIdMulti;
+
+  @Schema(description = "시공방법명")
+  private String constructSpecificationMulti;
+
+  @Schema(description = "가대메이커명")
+  private String supportMeaker;
+
+  @Schema(description = "경사")
+  private String slope;
+
+  @Schema(description = "각도")
+  private String angle;
+
+  @Schema(description = "방위각")
+  private String azimuth;
+
+  @Schema(description = "면조도구분")
+  private String surfaceType;
+
+  @Schema(description = "설치높이")
+  private String setupHeight;
+}
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index f2c9f9af..48c295d1 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -84,7 +84,9 @@
             SELECT
                   P.OBJECT_NO
                 , P.PLAN_NO
+                , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
                 , P.ESTIMATE_VALIDITY_TERM
+                , P.SNOWFALL
                 , P.ESTIMATE_TYPE
                 , P.ESTIMATE_OPTION
                 , P.PKG_ASP
@@ -94,9 +96,20 @@
                 , O.OBJECT_NAME
                 , O.OBJECT_NAME_OMIT
                 , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = O.CREATE_USER) AS CREATE_SALE_STORE_ID
+                , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
+                , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
+                , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
             FROM T_PLAN P WITH (NOLOCK)
 	        INNER JOIN T_OBJECT O WITH (NOLOCK)
                 ON P.OBJECT_NO = O.OBJECT_NO
+            LEFT OUTER JOIN M_PREFECTURE MP WITH (NOLOCK)
+                ON O.PREF_ID = MP.PREF_ID
+            LEFT OUTER JOIN M_PREFECTURE_AREA MPA WITH (NOLOCK)
+                ON O.PREF_ID = MPA.PREF_ID
+                AND O.AREA_ID = MPA.AREA_ID
+            LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+                ON C1.HEAD_CD = '202000'
+                AND P.STANDARD_WIND_SPEED_ID = C1.CODE
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
         ) T
@@ -112,6 +125,7 @@
               O.OBJECT_NO
             , O.SALE_STORE_ID
             , O.OBJECT_NAME
+            , O.OBJECT_NAME_OMIT
             , O.RECEIVE_COMPANY_NAME
             , O.RECEIVE_USER
             , O.DELIVERY_ZIP_NO
@@ -139,6 +153,7 @@
             , CONVERT(NVARCHAR(10), P.CREATE_DATETIME, 121)  AS ESTIMATE_DETAIL_CREATE_DATE
             , P.LAST_EDIT_DATETIME
             , P.LAST_EDIT_USER
+            , (SELECT CODE FROM M_COMM_L WHERE HEAD_CD = '200800' AND CODE_NM = O.OBJECT_NAME_OMIT) AS OBJECT_NAME_OMIT_CD
         FROM T_PLAN P WITH (NOLOCK)
         INNER JOIN T_OBJECT O WITH (NOLOCK)
             ON P.OBJECT_NO = O.OBJECT_NO
@@ -167,6 +182,7 @@
             , PE.SPECIAL_NOTE_CD
             , PE.ITEM_CHANGE_FLG
             , I.PNOW_W
+            , I.ITEM_GROUP
             , CASE WHEN I.ITEM_GROUP = 'MODULE_' THEN '1' ELSE '0' END AS MODULE_FLG
         FROM T_PART_ESTIMATE PE WITH (NOLOCK)
         INNER JOIN M_ITEM I WITH (NOLOCK)
@@ -199,6 +215,40 @@
             </foreach>
     </select>
 
+    <select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
+        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofList */
+        SELECT
+              P.OBJECT_NO
+            , P.PLAN_NO
+            , P.SETUP_HEIGHT
+            , P.SURFACE_TYPE
+            , RE.ROOF_SURFACE
+            , RE.ROOF_MATERIAL_ID
+            , RE.SUPPORT_METHOD_ID
+            , RE.CONSTRUCT_SPECIFICATION
+            , RE.SLOPE
+            , RE.ANGLE
+            , RE.AZIMUTH
+            , ISNULL(C1.CODE_NM, '') AS ROOF_MATERIAL_NAME
+            , ISNULL(C2.CODE_NM, '') AS SUPPORT_METHOD_NAME
+            , ISNULL(C3.CODE_NM, '') AS CONSTRUCT_SPECIFICATION_NAME
+        FROM T_PLAN P WITH (NOLOCK)
+        INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK)
+            ON P.OBJECT_NO = RE.OBJECT_NO
+            AND P.PLAN_NO = RE.PLAN_NO
+        LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+            ON C1.HEAD_CD = '201900'
+            AND RE.ROOF_MATERIAL_ID = C1.CODE
+        LEFT OUTER JOIN M_COMM_L C2 WITH (NOLOCK)
+            ON C2.HEAD_CD = '202100'
+            AND RE.SUPPORT_METHOD_ID = C2.CODE
+        LEFT OUTER JOIN M_COMM_L C3 WITH (NOLOCK)
+            ON C3.HEAD_CD = '201300'
+            AND RE.CONSTRUCT_SPECIFICATION = C3.CODE
+        WHERE P.OBJECT_NO = #{objectNo}
+            AND P.PLAN_NO = #{planNo}
+    </select>
+
     <select id="selectEstimateNoteList" parameterType="com.interplug.qcast.biz.estimate.dto.NoteRequest" resultType="com.interplug.qcast.biz.estimate.dto.NoteResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateNoteList */
         SELECT
@@ -303,6 +353,8 @@
                 , PKG_ASP = NULL
                 , PRICE_CD = #{priceCd}
                 , SURFACE_TYPE = #{surfaceType}
+                , CREATE_DATETIME = GETDATE()
+                , CREATE_USER = #{userId}
             </when>
             <otherwise>
                 , CHARGER = #{charger}
@@ -445,6 +497,7 @@
             , ITEM_NAME
             , SPECIFICATION
             , AMOUNT
+            , PC_ITEM_ID
         )
         SELECT
               #{roofNo} AS ROOF_NO
@@ -455,6 +508,7 @@
             , I.ITEM_NAME
             , I.PNOW_W
             , #{amount}
+            , #{pcItemId}
         FROM M_ITEM I WITH (NOLOCK)
         WHERE I.ITEM_ID = #{itemId}
     </insert>

From 31d216f03c0793acff5627771a7c618967725918 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 13 Nov 2024 14:33:16 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=EC=97=91?=
 =?UTF-8?q?=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20API=20=EA=B0=9C?=
 =?UTF-8?q?=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateMapper.java    |  6 ++
 .../qcast/biz/estimate/EstimateService.java   | 21 +++++
 .../biz/estimate/dto/EstimateRequest.java     | 11 ++-
 .../biz/estimate/dto/RoofInfoResponse.java    |  6 ++
 .../qcast/biz/estimate/dto/RoofResponse.java  | 15 ++++
 .../mappers/estimate/estimateMapper.xml       | 83 ++++++++++++++++++-
 6 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
index 8fcc17b6..caa65943 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
@@ -24,6 +24,12 @@ public interface EstimateMapper {
   // 견적서 지붕재 목록 조회
   public List<RoofResponse> selectEstimateRoofList(EstimateRequest estimateRequest);
 
+  // 견적서 지붕재 PC 목록 조회
+  public List<RoofResponse> selectEstimateRoofPcList(EstimateRequest estimateRequest);
+
+  // 견적서 지붕재 용량 목록 조회
+  public List<RoofResponse> selectEstimateRoofVolList(EstimateRequest estimateRequest);
+
   // 견적서 특이사항 목록 조회
   public List<NoteResponse> selectEstimateNoteList(NoteRequest noteRequest);
 
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 fb0f62a0..55a51206 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -683,9 +683,30 @@ public class EstimateService {
       }
 
       // 지붕재 목록 조회
+      estimateRequest.setSchItemGroup("MODULE_");
+
       RoofInfoResponse roofInfoResponse = new RoofInfoResponse();
       List<RoofResponse> roofList = estimateMapper.selectEstimateRoofList(estimateRequest);
+      List<RoofResponse> roofPcList = estimateMapper.selectEstimateRoofPcList(estimateRequest);
+      List<RoofResponse> roofVolList = estimateMapper.selectEstimateRoofVolList(estimateRequest);
+
+      BigDecimal moduleTotAmount = BigDecimal.ZERO;
+      BigDecimal moduleTotVol = BigDecimal.ZERO;
+      for (RoofResponse roofVol : roofVolList) {
+        BigDecimal amount =
+            new BigDecimal(StringUtils.isEmpty(roofVol.getAmount()) ? "0" : roofVol.getAmount());
+        BigDecimal vol =
+            new BigDecimal(StringUtils.isEmpty(roofVol.getVol()) ? "0" : roofVol.getVol());
+
+        moduleTotAmount = moduleTotAmount.add(amount);
+        moduleTotVol = moduleTotVol.add(vol);
+      }
+      roofInfoResponse.setModuleTotAmount(String.valueOf(moduleTotAmount));
+      roofInfoResponse.setModuleTotVol(String.valueOf(moduleTotVol));
+
       roofInfoResponse.setRoofList(roofList);
+      roofInfoResponse.setRoofPcList(roofPcList);
+      roofInfoResponse.setRoofVolList(roofVolList);
 
       estimateResponse.setRoofInfo(roofInfoResponse);
 
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
index daee7689..55950d59 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
@@ -163,18 +163,21 @@ public class EstimateRequest {
   private String[] arrItemId;
 
   // 다운로드 관련 조건
-  @Schema(description = "다운로드 정가 표시여부")
+  @Schema(description = "검색 - 다운로드 정가 표시여부")
   private String schUnitPriceFlg;
 
-  @Schema(description = "다운로드 표시여부")
+  @Schema(description = "검색 - 다운로드 표시여부")
   private String schDisplayFlg;
 
-  @Schema(description = "가대중량표 포함 여부")
+  @Schema(description = "검색 - 가대중량표 포함 여부")
   private String schWeightFlg;
 
-  @Schema(description = "도면 포함 여부")
+  @Schema(description = "검색 - 도면 포함 여부")
   private String schDrawingFlg;
 
+  @Schema(description = "검색 - 아이템 그룹")
+  private String schItemGroup;
+
   // 데이터 목록 관련 정보
   @Schema(description = "지붕재 목록")
   List<RoofRequest> roofList;
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
index 3f090e04..c367eb4a 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
@@ -9,6 +9,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class RoofInfoResponse {
+  @Schema(description = "모듈 총 수")
+  private String moduleTotAmount;
+
+  @Schema(description = "모듈 총 용량")
+  private String moduleTotVol;
+
   @Schema(description = "지붕면 목록")
   private List<RoofResponse> roofList;
 
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
index e4d131b2..81c95d57 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
@@ -64,4 +64,19 @@ public class RoofResponse {
 
   @Schema(description = "설치높이")
   private String setupHeight;
+
+  @Schema(description = "아이템 ID")
+  private String itemId;
+
+  @Schema(description = "아이템 번호")
+  private String itemNo;
+
+  @Schema(description = "매수")
+  private String amount;
+
+  @Schema(description = "용량")
+  private String vol;
+
+  @Schema(description = "Pc 모듈 매수")
+  private String pcModuleAmount;
 }
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 48c295d1..a9c30992 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -120,7 +120,7 @@
     </select>
 
     <select id="selectEstimateApiDetail" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.EstimateSendResponse">
-        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateDetail */
+        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateApiDetail */
         SELECT
               O.OBJECT_NO
             , O.SALE_STORE_ID
@@ -220,13 +220,13 @@
         SELECT
               P.OBJECT_NO
             , P.PLAN_NO
-            , P.SETUP_HEIGHT
+            , ROUND(CAST(P.SETUP_HEIGHT AS FLOAT), 2) AS SETUP_HEIGHT
             , P.SURFACE_TYPE
             , RE.ROOF_SURFACE
             , RE.ROOF_MATERIAL_ID
             , RE.SUPPORT_METHOD_ID
             , RE.CONSTRUCT_SPECIFICATION
-            , RE.SLOPE
+            , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
             , RE.ANGLE
             , RE.AZIMUTH
             , ISNULL(C1.CODE_NM, '') AS ROOF_MATERIAL_NAME
@@ -249,6 +249,83 @@
             AND P.PLAN_NO = #{planNo}
     </select>
 
+    <select id="selectEstimateRoofPcList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
+        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofPcList */
+        SELECT
+              T.ITEM_ID
+            , T.ITEM_NO
+            , SUM(T.AMOUNT) AS AMOUNT
+            , SUM(T.PC_AMOUNT) AS PC_MODULE_AMOUNT
+        FROM
+        (
+            SELECT
+                  P.OBJECT_NO
+                , P.PLAN_NO
+                , RE.ROOF_NO
+                , RE.ROOF_SURFACE
+                , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
+                , RIE.AMOUNT
+                , CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION
+                , I.ITEM_ID
+                , I.ITEM_NO
+                , I.ITEM_GROUP
+                , (SELECT SUM(AMOUNT) FROM T_ROOF_ITEM_ESTIMATE WHERE ROOF_NO = RIE.ROOF_NO AND OBJECT_NO = RIE.OBJECT_NO AND PLAN_NO = RIE.PLAN_NO AND PC_ITEM_ID = RIE.ITEM_ID) AS PC_AMOUNT
+            FROM T_PLAN P WITH (NOLOCK)
+            INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK)
+                ON P.OBJECT_NO = RE.OBJECT_NO
+                AND P.PLAN_NO = RE.PLAN_NO
+            INNER JOIN T_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK)
+                ON RE.ROOF_NO = RIE.ROOF_NO
+                AND RE.OBJECT_NO = RE.OBJECT_NO
+                AND RE.PLAN_NO = RE.PLAN_NO
+            INNER JOIN M_ITEM I WITH (NOLOCK)
+                ON RIE.ITEM_ID = I.ITEM_ID
+            WHERE P.OBJECT_NO = #{objectNo}
+                AND P.PLAN_NO = #{planNo}
+                AND I.ITEM_GROUP = 'PC_'
+        ) T
+        GROUP BY T.ITEM_ID, T.ITEM_NO
+    </select>
+
+    <select id="selectEstimateRoofVolList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
+        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofVolList */
+        SELECT
+              T.OBJECT_NO
+             , T.PLAN_NO
+             , T.ROOF_SURFACE
+             , T.SLOPE
+             , SUM(T.AMOUNT) AS AMOUNT
+             , ROUND(SUM(T.AMOUNT * T.SPECIFICATION / 1000), 4) AS VOL
+        FROM
+        (
+            SELECT
+                  P.OBJECT_NO
+                , P.PLAN_NO
+                , RE.ROOF_SURFACE
+                , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
+                , RIE.AMOUNT
+                , CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION
+                , I.ITEM_ID
+                , I.ITEM_GROUP
+            FROM T_PLAN P WITH (NOLOCK)
+	        INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK)
+                ON P.OBJECT_NO = RE.OBJECT_NO
+                AND P.PLAN_NO = RE.PLAN_NO
+            INNER JOIN T_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK)
+                ON RE.ROOF_NO = RIE.ROOF_NO
+                AND RE.OBJECT_NO = RE.OBJECT_NO
+                AND RE.PLAN_NO = RE.PLAN_NO
+            INNER JOIN M_ITEM I WITH (NOLOCK)
+                ON RIE.ITEM_ID = I.ITEM_ID
+            WHERE P.OBJECT_NO = #{objectNo}
+                AND P.PLAN_NO = #{planNo}
+                <if test='schItemGroup != null and schItemGroup != ""'>
+                AND I.ITEM_GROUP = #{schItemGroup}
+                </if>
+        ) T
+        GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_SURFACE, T.SLOPE
+    </select>
+
     <select id="selectEstimateNoteList" parameterType="com.interplug.qcast.biz.estimate.dto.NoteRequest" resultType="com.interplug.qcast.biz.estimate.dto.NoteResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateNoteList */
         SELECT

From 77ea9441f68d759aa5c4ae7ff1f33407a18af3e0 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 13 Nov 2024 15:58:53 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=8B=9C=20QSP=20=EC=84=A4=EA=B3=84?=
 =?UTF-8?q?=EC=9D=98=EB=A2=B0=20=EB=AC=BC=EA=B1=B4=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   |  5 ++-
 .../qcast/biz/object/ObjectService.java       | 37 ++++++++++++++++++-
 .../qcast/biz/object/dto/ObjectResponse.java  |  3 ++
 .../qcast/biz/object/dto/PlanReqRequest.java  |  3 ++
 .../resources/mappers/object/objectMapper.xml |  1 +
 5 files changed, 45 insertions(+), 4 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 55a51206..8e813283 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -10,7 +10,9 @@ import com.interplug.qcast.biz.object.dto.ObjectResponse;
 import com.interplug.qcast.biz.object.dto.PlanRequest;
 import com.interplug.qcast.biz.object.dto.PlanResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.PwrGnrSimService;
+import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimGuideResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimRequest;
+import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimResponse;
 import com.interplug.qcast.config.Exception.ErrorCode;
 import com.interplug.qcast.config.Exception.QcastException;
 import com.interplug.qcast.config.message.Messages;
@@ -763,7 +765,7 @@ public class EstimateService {
       PwrGnrSimRequest pwrGnrSimRequest = new PwrGnrSimRequest();
       pwrGnrSimRequest.setObjectNo(estimateResponse.getObjectNo());
       pwrGnrSimRequest.setPlanNo(estimateResponse.getPlanNo());
-      /*
+
       PwrGnrSimResponse pwrGnrSimResponse =
           pwrGnrSimService.selectPwrGnrSimulation(pwrGnrSimRequest);
       if (pwrGnrSimResponse != null) {
@@ -781,7 +783,6 @@ public class EstimateService {
       }
 
       estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
-       */
 
       excelUtil.download(
           request,
diff --git a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
index bc28e492..a0e9e5b5 100644
--- a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
+++ b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
@@ -337,8 +337,41 @@ public class ObjectService {
           message.getMessage("common.message.required.data", "Object No"));
     }
 
-    // 물건정보 삭제
-    result = objectMapper.deleteObject(objectRequest);
+    // object 상세 정보 조회
+    ObjectResponse objectResponse = objectMapper.selectObjectDetail(objectRequest.getObjectNo());
+    if (objectResponse != null) {
+      // 설계의뢰 번호가 존재하고 물건정보에 견적서가 없을 경우 QSP 설계의뢰 물건번호 초기화
+      if (!StringUtils.isEmpty(objectResponse.getPlanReqNo())
+          && objectResponse.getEstimateTotCnt() == 0) {
+        PlanReqResponse response = null;
+
+        PlanReqRequest planReqRequest = new PlanReqRequest();
+        planReqRequest.setSaleStoreId(objectResponse.getSaleStoreId());
+        planReqRequest.setSaleStoreLevel(objectResponse.getSaleStoreLevel());
+        planReqRequest.setObjectNo(objectResponse.getObjectNo());
+        planReqRequest.setPlanReqNo(objectResponse.getPlanReqNo());
+        planReqRequest.setDelFlg("1");
+
+        String strResponse =
+            interfaceQsp.callApi(
+                HttpMethod.POST, QSP_API_URL + "/api/planReq/updateObjectNo", planReqRequest);
+        if (!"".equals(strResponse)) {
+          com.fasterxml.jackson.databind.ObjectMapper om =
+              new com.fasterxml.jackson.databind.ObjectMapper()
+                  .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+          response = om.readValue(strResponse, PlanReqResponse.class);
+
+          Map<String, Object> map = (Map<String, Object>) response.getResult();
+          if ("E".equals(String.valueOf(map.get("resultCode")))) {
+            throw new QcastException(
+                ErrorCode.INTERNAL_SERVER_ERROR, String.valueOf(map.get("resultMsg")));
+          }
+        }
+      }
+
+      // 물건정보 삭제
+      result = objectMapper.deleteObject(objectRequest);
+    }
 
     return result;
   }
diff --git a/src/main/java/com/interplug/qcast/biz/object/dto/ObjectResponse.java b/src/main/java/com/interplug/qcast/biz/object/dto/ObjectResponse.java
index 072cd47c..a786e460 100644
--- a/src/main/java/com/interplug/qcast/biz/object/dto/ObjectResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/object/dto/ObjectResponse.java
@@ -125,6 +125,9 @@ public class ObjectResponse {
   @Schema(description = "플랜 전체 건수")
   private String planTotCnt;
 
+  @Schema(description = "견적서 전체 건수")
+  private Integer estimateTotCnt;
+
   // 플랜목록
   @Schema(description = "플랜목록")
   private List<PlanResponse> planList;
diff --git a/src/main/java/com/interplug/qcast/biz/object/dto/PlanReqRequest.java b/src/main/java/com/interplug/qcast/biz/object/dto/PlanReqRequest.java
index a1aa3cd6..7898141c 100644
--- a/src/main/java/com/interplug/qcast/biz/object/dto/PlanReqRequest.java
+++ b/src/main/java/com/interplug/qcast/biz/object/dto/PlanReqRequest.java
@@ -17,6 +17,9 @@ public class PlanReqRequest {
   @Schema(description = "물건번호")
   private String objectNo;
 
+  @Schema(description = "삭제여부")
+  private String delFlg;
+
   @Schema(description = "검색 - 설계의뢰번호")
   private String schPlanReqNo;
 
diff --git a/src/main/resources/mappers/object/objectMapper.xml b/src/main/resources/mappers/object/objectMapper.xml
index 783dc630..3d890072 100644
--- a/src/main/resources/mappers/object/objectMapper.xml
+++ b/src/main/resources/mappers/object/objectMapper.xml
@@ -307,6 +307,7 @@
             , S.SALE_STORE_LEVEL
             , ISNULL(P.PREF_NAME, '') AS PREF_NAME
             , ISNULL(PA.AREA_NAME, '') AS AREA_NAME
+            , (SELECT COUNT(1) FROM T_PLAN WHERE OBJECT_NO = O.OBJECT_NO AND DEL_FLG = '0' AND DRAWING_ESTIMATE_CREATE_DATE IS NOT NULL) AS ESTIMATE_TOT_CNT
         FROM T_OBJECT O WITH (NOLOCK)
         INNER JOIN M_SALES_STORE S WITH(NOLOCK)
             ON O.SALE_STORE_ID = S.SALE_STORE_ID

From c881f67875cefc36afb1811d8365650c7bc31749 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Wed, 13 Nov 2024 18:03:07 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=9D=B8?=
 =?UTF-8?q?=EC=A6=9D=EC=9A=A9=EB=9F=89=20=EA=B3=84=EC=82=B0=20API=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateMapper.java    |  3 ++
 .../qcast/biz/estimate/EstimateService.java   | 24 +++++----
 .../biz/estimate/dto/RoofInfoResponse.java    |  5 +-
 .../qcast/biz/estimate/dto/RoofResponse.java  |  2 +-
 .../mappers/estimate/estimateMapper.xml       | 50 +++++++++++++++++--
 5 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
index caa65943..48bf6fed 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java
@@ -21,6 +21,9 @@ public interface EstimateMapper {
   // 아이템 마스터 목록 조회
   public List<ItemResponse> selectItemMasterList(EstimateRequest estimateRequest);
 
+  // 견적서 지붕재 인증용량 조회
+  public String selectEstimateRoofCertVolKw(EstimateRequest estimateRequest);
+
   // 견적서 지붕재 목록 조회
   public List<RoofResponse> selectEstimateRoofList(EstimateRequest estimateRequest);
 
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 8e813283..23c54b5f 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -10,9 +10,6 @@ import com.interplug.qcast.biz.object.dto.ObjectResponse;
 import com.interplug.qcast.biz.object.dto.PlanRequest;
 import com.interplug.qcast.biz.object.dto.PlanResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.PwrGnrSimService;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimGuideResponse;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimRequest;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimResponse;
 import com.interplug.qcast.config.Exception.ErrorCode;
 import com.interplug.qcast.config.Exception.QcastException;
 import com.interplug.qcast.config.message.Messages;
@@ -28,6 +25,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -685,31 +683,33 @@ public class EstimateService {
       }
 
       // 지붕재 목록 조회
-      estimateRequest.setSchItemGroup("MODULE_");
-
       RoofInfoResponse roofInfoResponse = new RoofInfoResponse();
       List<RoofResponse> roofList = estimateMapper.selectEstimateRoofList(estimateRequest);
       List<RoofResponse> roofPcList = estimateMapper.selectEstimateRoofPcList(estimateRequest);
+      estimateRequest.setSchItemGroup("MODULE_");
       List<RoofResponse> roofVolList = estimateMapper.selectEstimateRoofVolList(estimateRequest);
 
       BigDecimal moduleTotAmount = BigDecimal.ZERO;
-      BigDecimal moduleTotVol = BigDecimal.ZERO;
+      BigDecimal moduleTotVolKw = BigDecimal.ZERO;
       for (RoofResponse roofVol : roofVolList) {
         BigDecimal amount =
             new BigDecimal(StringUtils.isEmpty(roofVol.getAmount()) ? "0" : roofVol.getAmount());
         BigDecimal vol =
-            new BigDecimal(StringUtils.isEmpty(roofVol.getVol()) ? "0" : roofVol.getVol());
+            new BigDecimal(StringUtils.isEmpty(roofVol.getVolKw()) ? "0" : roofVol.getVolKw());
 
         moduleTotAmount = moduleTotAmount.add(amount);
-        moduleTotVol = moduleTotVol.add(vol);
+        moduleTotVolKw = moduleTotVolKw.add(vol);
       }
       roofInfoResponse.setModuleTotAmount(String.valueOf(moduleTotAmount));
-      roofInfoResponse.setModuleTotVol(String.valueOf(moduleTotVol));
+      roofInfoResponse.setModuleTotVolKw(String.valueOf(moduleTotVolKw));
 
       roofInfoResponse.setRoofList(roofList);
       roofInfoResponse.setRoofPcList(roofPcList);
       roofInfoResponse.setRoofVolList(roofVolList);
 
+      // 인증용량 구하기 (지붕면마다 모듈과 PCS의 총 용량을 서로 비교해 낮은쪽 용량으로 합산)
+      roofInfoResponse.setCertVolKw(estimateMapper.selectEstimateRoofCertVolKw(estimateRequest));
+
       estimateResponse.setRoofInfo(roofInfoResponse);
 
       // 아이템 목록 조회
@@ -757,11 +757,13 @@ public class EstimateService {
       estimateResponse.setTotPrice(
           String.format("%1$,.0f", Double.parseDouble(estimateResponse.getTotPrice())));
 
-      String excelFileName = "Quation_Detail";
+      String excelFileName =
+          "Quation_Detail_" + new SimpleDateFormat("yyyyMMdd").format(new Date());
       String excelTemplatePath =
           excelTemplateFilePath + File.separator + "excel_download_quotation_detail_template.xlsx";
 
       //  발전시뮬레이션 계산
+      /*
       PwrGnrSimRequest pwrGnrSimRequest = new PwrGnrSimRequest();
       pwrGnrSimRequest.setObjectNo(estimateResponse.getObjectNo());
       pwrGnrSimRequest.setPlanNo(estimateResponse.getPlanNo());
@@ -784,6 +786,8 @@ public class EstimateService {
 
       estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
 
+       */
+
       excelUtil.download(
           request,
           response,
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
index c367eb4a..4c035da5 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofInfoResponse.java
@@ -9,11 +9,14 @@ import lombok.Setter;
 @Getter
 @Setter
 public class RoofInfoResponse {
+  @Schema(description = "인증용량")
+  private String certVolKw;
+
   @Schema(description = "모듈 총 수")
   private String moduleTotAmount;
 
   @Schema(description = "모듈 총 용량")
-  private String moduleTotVol;
+  private String moduleTotVolKw;
 
   @Schema(description = "지붕면 목록")
   private List<RoofResponse> roofList;
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
index 81c95d57..361fc215 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/RoofResponse.java
@@ -75,7 +75,7 @@ public class RoofResponse {
   private String amount;
 
   @Schema(description = "용량")
-  private String vol;
+  private String volKw;
 
   @Schema(description = "Pc 모듈 매수")
   private String pcModuleAmount;
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index a9c30992..9e51be6c 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -215,6 +215,48 @@
             </foreach>
     </select>
 
+    <select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String">
+        /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
+        SELECT
+              FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
+        FROM
+        (
+            SELECT
+                  P.OBJECT_NO
+                , P.PLAN_NO
+                , RE.ROOF_NO
+                , RE.ROOF_SURFACE
+                , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
+                , RIE.AMOUNT
+                , CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION
+                , ROUND((RIE.AMOUNT * CAST(ISNULL(RIE.SPECIFICATION, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW
+                , I.ITEM_ID
+                , I.ITEM_NO
+                , ISNULL((
+                    SELECT
+                        SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
+                    FROM T_ROOF_ITEM_ESTIMATE
+                    WHERE ROOF_NO = RIE.ROOF_NO
+                        AND OBJECT_NO = RIE.OBJECT_NO
+                        AND PLAN_NO = RIE.PLAN_NO
+                        AND PC_ITEM_ID = RIE.ITEM_ID
+                  ), 0) AS MODULE_VOL_KW
+            FROM T_PLAN P WITH (NOLOCK)
+            INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK)
+                ON P.OBJECT_NO = RE.OBJECT_NO
+                AND P.PLAN_NO = RE.PLAN_NO
+            INNER JOIN T_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK)
+                ON RE.ROOF_NO = RIE.ROOF_NO
+                AND RE.OBJECT_NO = RE.OBJECT_NO
+                AND RE.PLAN_NO = RE.PLAN_NO
+            INNER JOIN M_ITEM I WITH (NOLOCK)
+                ON RIE.ITEM_ID = I.ITEM_ID
+            WHERE P.OBJECT_NO = #{objectNo}
+                AND P.PLAN_NO = #{planNo}
+                AND I.ITEM_GROUP = 'PC_'
+        ) T
+    </select>
+
     <select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofList */
         SELECT
@@ -290,17 +332,19 @@
     <select id="selectEstimateRoofVolList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofVolList */
         SELECT
-              T.OBJECT_NO
+               T.OBJECT_NO
              , T.PLAN_NO
+             , T.ROOF_NO
              , T.ROOF_SURFACE
              , T.SLOPE
              , SUM(T.AMOUNT) AS AMOUNT
-             , ROUND(SUM(T.AMOUNT * T.SPECIFICATION / 1000), 4) AS VOL
+             , ROUND(SUM(T.AMOUNT * T.SPECIFICATION / 1000), 4) AS VOL_KW
         FROM
         (
             SELECT
                   P.OBJECT_NO
                 , P.PLAN_NO
+                , RE.ROOF_NO
                 , RE.ROOF_SURFACE
                 , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
                 , RIE.AMOUNT
@@ -323,7 +367,7 @@
                 AND I.ITEM_GROUP = #{schItemGroup}
                 </if>
         ) T
-        GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_SURFACE, T.SLOPE
+        GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_NO, T.ROOF_SURFACE, T.SLOPE
     </select>
 
     <select id="selectEstimateNoteList" parameterType="com.interplug.qcast.biz.estimate.dto.NoteRequest" resultType="com.interplug.qcast.biz.estimate.dto.NoteResponse">