src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -1571,7 +1571,13 @@ public class EstimateService {
         estimateResponse.setDrawingImg1(drawingImg1);
       }
       log.debug("url1 ::: {}", url);
-
+//      File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+//      if (file.exists()) {
+//        InputStream imageInputStream =
+//            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+//        byte[] drawingImg1 = Util.toByteArray(imageInputStream);
+//        estimateResponse.setDrawingImg1(drawingImg1);
+//      }
       String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
       URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png");
       URLConnection con2 = url2.openConnection();
@@ -1583,7 +1589,13 @@ public class EstimateService {
         estimateResponse.setDrawingImg2(drawingImg2);
       }
       log.debug("url2 ::: {}", url2);
-
+//      file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
+//      if (file.exists()) {
+//        InputStream imageInputStream2 =
+//            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
+//        byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
+//        estimateResponse.setDrawingImg2(drawingImg2);
+//      }
 
       //userId 에 따른 영업점 주소, 전화, fax 정보 조회
       if(estimateRequest.getSaleStoreId() != null && "T01".equals(estimateRequest.getSaleStoreId())){
@@ -1646,10 +1658,10 @@ public class EstimateService {
 
         String userId = estimateRequest.getUserId();
         String storeLvl = estimateRequest.getStoreLvl();
-        String createStoreId = estimateRequest.getCreateStoreId();
+        String saleStoreId = estimateRequest.getSaleStoreId();
         if(storeLvl != null && storeLvl.equals("2")){
-          if(!Objects.equals(createStoreId, userId))
+          if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId))
-            templateFilePath = "pdf_download_quotation_detail_template2.html";
+              templateFilePath = "pdf_download_quotation_detail_template2.html";
         }
 
         // 템플릿 html 조회
@@ -1697,17 +1709,15 @@ public class EstimateService {
         Workbook workbook = null;
 
         String excelTemplateNam = "excel_download_quotation_detail_template.xlsx";
-
         String userId = estimateRequest.getUserId();
         String storeLvl = estimateRequest.getStoreLvl();
-        String createStoreId = estimateRequest.getCreateStoreId();
+        String saleStoreId = estimateRequest.getSaleStoreId();
         if(storeLvl != null && storeLvl.equals("2")){
-          if(!Objects.equals(createStoreId, userId))
+          if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId))
             excelTemplateNam = "excel_download_quotation_detail_template2.xlsx";
         }
 
 
-
         // itemGroup이 "STAND_"가 아닌 항목들만 필터링하여 새로운 리스트 생성
         List<ItemResponse> estimateItemList15 = estimateItemList.stream()
                 .filter(item -> !"STAND_".equals(item.getItemGroup()))
@@ -2115,15 +2125,13 @@ public class EstimateService {
               + StringUtils.defaultString(itemResponse.getItemName()) + "</td>");
       sb.append("<td style='width:120px;'>" + StringUtils.defaultString(itemResponse.getItemNo())
               + "</td>");
-      sb.append(
+      sb.append("<td style='width:80px;text-align:right;'>"
-          "<td class='hide-column' style='width:80px;text-align:right;'>"
+              + StringUtils.defaultString(itemResponse.getSalePrice()) + "</td>");
-              + StringUtils.defaultString(itemResponse.getSalePrice())
-              + "</td>");
       sb.append("<td style='width:60px;text-align:right;'>"
               + StringUtils.defaultString(itemResponse.getAmount()) + "</td>");
       sb.append(
               "<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getUnit()) + "</td>");
-      sb.append("<td class='hide-column' style='width:80px;text-align:right;'>"
+      sb.append("<td style='width:80px;text-align:right;'>"
               + StringUtils.defaultString(itemResponse.getSaleTotPrice()) + "</td>");
       sb.append("</tr>");
     }

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java

@@ -219,6 +219,4 @@ public class EstimateRequest {
   @Schema(description = "판매점레벨")
   private String storeLvl;
 
-  @Schema(description = "견적서생성판매점코드")
-  private String createStoreId;
 }

src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html

@@ -43,7 +43,7 @@
             line-height: 115%;
             color: #333
         }
-
+        
         .month-table td {
             word-break: break-all;
         }
@@ -390,10 +390,6 @@
             font-size: 8px;
         }
 
-        .hide-column {
-            display: none;
-        }
-
     </style>
 </head>
 <body>
@@ -449,7 +445,7 @@
                             <span id="tel"></span>
                         </div>
                         <div class="number">
-                            <span>FAX :</span>
+                           <span>FAX :</span>
                             <span id="fax"></span>
                         </div>
                     </div>
@@ -496,7 +492,7 @@
             <th style="width: 110px;">価格</th>
         </tr>
         </thead>
-        <tbody id="itemList_detail" >
+        <tbody id="itemList_detail2">
         <!--        <tr>-->
         <!--            <td>1</td>-->
         <!--            <td>Re.RISE 415</td>-->
@@ -517,16 +513,16 @@
         <!--        </tr>-->
         <tr>
             <td class="al-r" colspan="6">小計</td>
-            <td class="al-r hide-column" id="supplyPrice"></td>
+            <td class="al-r" ></td>
         </tr>
         <tr>
             <td class="al-r" colspan="5">消費税</td>
             <td class="al-r">(10%)</td>
-            <td class="al-r hide-column" id="vatPrice"></td>
+            <td class="al-r" ></td>
         </tr>
         <tr>
             <td class="al-r end" colspan="6">合計金額</td>
-            <td class="al-r end hide-column" id="totPrice1"></td>
+            <td class="al-r end" ></td>
         </tr>
         </tbody>
     </table>
@@ -680,13 +676,13 @@
 <div class="section4">
     <table class="mb20">
         <tbody>
-        <tr>
+		<tr>
             <th class="col-15">物件番号</th>
             <td class="al-l" id="objectNo4" colspan="3"></td>
             <th class="col-15">作成日</th>
             <td id="drawingEstimateCreateDate4"></td>
         </tr>
-        <tr>
+		<tr>
             <th class="col-15">物件名</th>
             <td class="al-l" id="objectName" colspan="3"></td>
             <th class="col-15">積雪条件</th>
@@ -801,7 +797,7 @@
             <th class="col-15">作成日</th>
             <td id="drawingEstimateCreateDate5"></td>
         </tr>
-        <tr>
+		<tr>
             <th class="col-15">物件名</th>
             <td class="al-l" id="objectName5" colspan="3"></td>
             <th class="col-15">積雪条件</th>
@@ -832,13 +828,13 @@
     </div>
 
     <table class="mb20">
-        <thead>
+		<thead>
-        <tr>
+		<tr>
             <th class="col-15">No</th>
             <th class="col-15">部材名</th>
             <th class="col-15">数量</th>
         </tr>
-        </thead>
+		</thead>
         <tbody id="standItemList_detail">
         </tbody>
     </table>
@@ -879,7 +875,7 @@
 
 </div>
 <div class="section6">
-    <!--    <h1 class="title">重量算出シート</h1>-->
+<!--    <h1 class="title">重量算出シート</h1>-->
     <div class="all-price-wrap">
         <div class="all-price">
             <span>重量算出シート</span>
@@ -905,8 +901,8 @@
     <!-- 시스템 중량 정보 -->
 
     <div style="text-align: right; font-size: 11px;">
-        <span>システム重量合計: </span><span id="totGrossWt"></span> kg
+            <span>システム重量合計: </span><span id="totGrossWt"></span> kg
-    </div>
+        </div>
 
 
     <div style="text-align: right; font-size: 10px; color: #666; margin-bottom: 20px;">