From c07003bac8f2a6163d0a725423ae196086278b9e Mon Sep 17 00:00:00 2001 From: cha Date: Thu, 3 Apr 2025 14:10:45 +0900 Subject: [PATCH 01/11] =?UTF-8?q?952-2=EC=B0=A8=EC=A0=90=20=ED=8A=B9?= =?UTF-8?q?=EA=B0=80=20=EC=9E=88=EB=8A=94=202nd=20Agency=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/estimate/EstimateController.java | 7 +++++ .../qcast/biz/estimate/EstimateService.java | 31 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java index 50ed0ca9..215d8343 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java @@ -96,4 +96,11 @@ public class EstimateController { throws Exception { estimateService.excelDownload(request, response, estimateRequest); } + + @Operation(description = "2차점 특가 있는 2nd Agency 목록을 조회한다.") + @GetMapping("/agency-cust-list") + @ResponseStatus(HttpStatus.OK) + public EstimateApiResponse selectAgencyCustList(PriceRequest priceRequest) throws Exception { + return estimateService.selectAgencyCustList(priceRequest); + } } 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 99606339..e2be6132 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -2246,4 +2246,35 @@ public class EstimateService { return circuitCfg; } + + public EstimateApiResponse selectAgencyCustList(PriceRequest priceRequest) throws Exception { + // Validation + + if (StringUtils.isEmpty(priceRequest.getSapSalesStoreCd())) { + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, + message.getMessage("common.message.required.data", "Sap Sale Store Code")); + } + + + EstimateApiResponse response = null; + /* [1]. QSP API (url + param) Setting */ + String url = QSP_API_URL + "/api/master/agencyCustList"; + String apiUrl = UriComponentsBuilder.fromHttpUrl(url) + .queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString(); + + /* [2]. QSP API CALL -> Response */ + String strResponse = interfaceQsp.callApi(HttpMethod.GET, apiUrl, null); + + 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, EstimateApiResponse.class); + } else { + // [msg] No data + throw new QcastException(ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data")); + } + + return response; + } } From a31d0e9c1c77f7a4eb2720b29cb19a0851f83061 Mon Sep 17 00:00:00 2001 From: cha Date: Fri, 4 Apr 2025 10:27:22 +0900 Subject: [PATCH 02/11] =?UTF-8?q?952-2=EC=B0=A8=20SAP=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=A0=90=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/interplug/qcast/biz/estimate/dto/PriceRequest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/PriceRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/PriceRequest.java index 4a295607..a8c877e3 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/PriceRequest.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/PriceRequest.java @@ -23,4 +23,7 @@ public class PriceRequest { @Schema(description = "아이템번호 목록") private List itemIdList; + + @Schema(description = "2차 SAP 판매점코드") + private String secSapSalesStoreCd; } From 786e8b6a8beec8083ec84fd014af2f8281ec834d Mon Sep 17 00:00:00 2001 From: cha Date: Fri, 4 Apr 2025 16:26:15 +0900 Subject: [PATCH 03/11] =?UTF-8?q?952-2=EC=B0=A8=20SAP=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=A0=90=EC=BD=94=EB=93=9C=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/estimate/dto/EstimateRequest.java | 4 ++++ .../interplug/qcast/biz/estimate/dto/EstimateResponse.java | 3 +++ src/main/resources/mappers/estimate/estimateMapper.xml | 5 +++++ 3 files changed, 12 insertions(+) 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 6f7e2a59..01fde921 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 @@ -212,4 +212,8 @@ public class EstimateRequest { @Schema(description = "발전시뮬레이션 타입") private String pwrGnrSimType; + + @Schema(description = "2차 SAP 판매점코드") + private String secSapSalesStoreCd; + } 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 e3b2bfea..9810d227 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 @@ -279,4 +279,7 @@ public class EstimateResponse { @Schema(description = "SAP STORE CD") private String sapSalesStoreCd; + + @Schema(description = "2차 SAP 판매점코드") + private String secSapSalesStoreCd; } diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index d912f1fa..c265fccc 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -56,6 +56,7 @@ , PI.SYNC_FLG , PI.CREATE_DATETIME , PI.CREATE_USER + , PI.SEC_SAP_SALES_STORE_CD , O.OBJECT_NAME , O.OBJECT_NAME_OMIT , O.REMARKS AS OBJECT_REMARKS @@ -679,6 +680,7 @@ UPDATE T_PLAN_INFO SET ESTIMATE_TYPE = #{estimateType} + , SEC_SAP_SALES_STORE_CD = #{secSapSalesStoreCd} , CONSTRUCT_SPECIFICATION_MULTI = #{constructSpecificationMulti} @@ -731,6 +733,7 @@ , PKG_ASP = NULL , PRICE_CD = #{priceCd} , TEMP_FLG = CASE WHEN TEMP_FLG = '0' THEN '0' ELSE #{tempFlg} END + , SEC_SAP_SALES_STORE_CD = #{secSapSalesStoreCd} WHERE OBJECT_NO = #{objectNo} AND PLAN_NO = #{planNo} @@ -1167,6 +1170,7 @@ , SYNC_FLG , CREATE_DATETIME , CREATE_USER + , SEC_SAP_SALES_STORE_CD ) SELECT #{copyObjectNo} AS OBJECT_NO @@ -1187,6 +1191,7 @@ , '0' AS SYNC_FLG , GETDATE() AS CREATE_DATETIME , #{userId} AS CREATE_USER + , PI.SEC_SAP_SALES_STORE_CD FROM T_PLAN_INFO PI WITH (NOLOCK) WHERE PI.OBJECT_NO = #{objectNo} AND PI.PLAN_NO = #{planNo} From dc23488cd2fcbab74ccab5fcd60e8d0358ba1459 Mon Sep 17 00:00:00 2001 From: cha Date: Fri, 4 Apr 2025 17:21:53 +0900 Subject: [PATCH 04/11] =?UTF-8?q?952-EstimateSendResponse=202=EC=B0=A8=20S?= =?UTF-8?q?AP=20=ED=8C=90=EB=A7=A4=EC=A0=90=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/estimate/dto/EstimateSendResponse.java | 3 +++ 1 file changed, 3 insertions(+) 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 0c0b5aef..396ca86d 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 @@ -115,4 +115,7 @@ public class EstimateSendResponse { @Schema(description = "첨부파일 목록") List fileList; + + @Schema(description = "2차 SAP 판매점코드") + private String secSapSalesStoreCd; } From fc132e28e02a3d1db4775a38e836da6b6fbb228a Mon Sep 17 00:00:00 2001 From: cha Date: Fri, 4 Apr 2025 17:38:34 +0900 Subject: [PATCH 05/11] =?UTF-8?q?952-EstimateSendResponse=202=EC=B0=A8=20S?= =?UTF-8?q?AP=20=ED=8C=90=EB=A7=A4=EC=A0=90=EC=BD=94=EB=93=9C=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/interplug/qcast/biz/estimate/EstimateService.java | 2 ++ 1 file changed, 2 insertions(+) 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 e2be6132..abcfde18 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1724,6 +1724,8 @@ public class EstimateService { quoteList.add(estimateSendResponse); estimateSendRequest.setQuoteList(quoteList); + //2차점명 + estimateSendResponse.setSecSapSalesStoreCd(estimateRequest.getSecSapSalesStoreCd()); } EstimateApiResponse response = null; From b4850483d3f0c688e0e975236c8a80883eac7c39 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 7 Apr 2025 14:33:47 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=EC=96=91=EB=8B=A8=20=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EA=B0=AF=EC=88=98=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/master/dto/quotation/ApiQuotationItemRequest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java index cfba5780..8ff36fdd 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java @@ -1,8 +1,8 @@ package com.interplug.qcast.biz.master.dto.quotation; -import java.util.List; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -22,4 +22,7 @@ public class ApiQuotationItemRequest { @Schema(description = "PCS 목록") @NotNull public List pcses; + + @Schema(description = "양단 케이블 갯수") + public Integer dblCblTotCnt = 0; } From a682efbd2b2ccdbff91d80ab043923031da8e64e Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 8 Apr 2025 16:28:49 +0900 Subject: [PATCH 07/11] =?UTF-8?q?QCast=20API=20#886=20=EA=B2=AC=EC=A0=81?= =?UTF-8?q?=EC=84=9C=20Excel,=20Pdf=20=EB=8B=A4=EC=9A=B4=EC=8B=9C=20Open?= =?UTF-8?q?=20=EC=A0=9C=ED=92=88=EC=9D=80=20=EB=8B=A8=EA=B0=80=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EC=97=90=20OPEN=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateService.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 abcfde18..6492c3a4 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1409,6 +1409,11 @@ public class EstimateService { itemResponse.setSalePrice(""); itemResponse.setSaleTotPrice(""); } + + // 886 Excel, PDF에 OPEN_FLG = 1은 단가필드에 OPEN 텍스트로 보여주도록 + if ("1".equals(itemResponse.getOpenFlg())) { + itemResponse.setSalePrice("OPEN"); + } } // 합산 문자열 통화로 변환 처리 @@ -1724,7 +1729,7 @@ public class EstimateService { quoteList.add(estimateSendResponse); estimateSendRequest.setQuoteList(quoteList); - //2차점명 + // 2차점명 estimateSendResponse.setSecSapSalesStoreCd(estimateRequest.getSecSapSalesStoreCd()); } @@ -2254,7 +2259,7 @@ public class EstimateService { if (StringUtils.isEmpty(priceRequest.getSapSalesStoreCd())) { throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, - message.getMessage("common.message.required.data", "Sap Sale Store Code")); + message.getMessage("common.message.required.data", "Sap Sale Store Code")); } @@ -2262,15 +2267,15 @@ public class EstimateService { /* [1]. QSP API (url + param) Setting */ String url = QSP_API_URL + "/api/master/agencyCustList"; String apiUrl = UriComponentsBuilder.fromHttpUrl(url) - .queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString(); + .queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString(); /* [2]. QSP API CALL -> Response */ String strResponse = interfaceQsp.callApi(HttpMethod.GET, apiUrl, null); if (!"".equals(strResponse)) { com.fasterxml.jackson.databind.ObjectMapper om = - new com.fasterxml.jackson.databind.ObjectMapper() - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + new com.fasterxml.jackson.databind.ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); response = om.readValue(strResponse, EstimateApiResponse.class); } else { // [msg] No data From 4163f324b242f869fab04c209ccbb38af738f843 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 10 Apr 2025 10:43:30 +0900 Subject: [PATCH 08/11] =?UTF-8?q?#886=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?= =?UTF-8?q?=EC=97=91=EC=85=80,=20PDF=20=EB=8B=A4=EC=9A=B4=EC=8B=9C=20?= =?UTF-8?q?=EA=B8=88=EC=95=A1=ED=95=84=EB=93=9C=EB=8F=84=20OPEN=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/interplug/qcast/biz/estimate/EstimateService.java | 1 + 1 file changed, 1 insertion(+) 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 6492c3a4..2eb4b280 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1413,6 +1413,7 @@ public class EstimateService { // 886 Excel, PDF에 OPEN_FLG = 1은 단가필드에 OPEN 텍스트로 보여주도록 if ("1".equals(itemResponse.getOpenFlg())) { itemResponse.setSalePrice("OPEN"); + itemResponse.setSaleTotPrice("OPEN"); } } From ff5a25fe18c2abcca0b61836ae146e224b9c17dc Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 10 Apr 2025 15:10:25 +0900 Subject: [PATCH 09/11] =?UTF-8?q?/*=20sqlid=20:=20com.interplug.qcast.biz.?= =?UTF-8?q?estimate.selectEstimateApiFailList=20*/=20T=5FPLAN=20=20/=20T?= =?UTF-8?q?=5FPLAN=5FINFO=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=82=98?= =?UTF-8?q?=EB=89=A8=20=EC=BB=AC=EB=9F=BC=20=EB=AF=B8=EB=B0=98=EC=98=81?= =?UTF-8?q?=EB=B6=84..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/estimate/estimateMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index c265fccc..824d4791 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -176,7 +176,7 @@ , P.CONSTRUCT_SPECIFICATION , P.NORTH_ARRANGEMENT , PI.ESTIMATE_TYPE - , P.PKG_ASP + , PI.PKG_ASP , P.DEL_FLG , CONVERT(NVARCHAR(10), PI.CREATE_DATETIME, 121) AS ESTIMATE_DETAIL_CREATE_DATE , P.LAST_EDIT_DATETIME @@ -192,7 +192,7 @@ ON O.OBJECT_NO = OI.OBJECT_NO INNER JOIN M_SALES_STORE SS WITH(NOLOCK) ON O.SALE_STORE_ID = SS.SALE_STORE_ID - WHERE P.SYNC_FLG = '0' + WHERE PI.SYNC_FLG = '0' AND OI.SOURCE_ORIGIN = 'QCAST_III' AND OI.ORG_DEL_FLG = '0' From 129c4b12d3eebbd1c5d1627b8d1dbacace024908 Mon Sep 17 00:00:00 2001 From: cha Date: Fri, 11 Apr 2025 17:25:11 +0900 Subject: [PATCH 10/11] =?UTF-8?q?975-ApiQuotationItemResponse=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BC=90(=EC=96=91=EB=8B=A8=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EB=B8=94)=20=ED=83=80=EC=9E=85=20=EC=BD=94=EB=93=9C=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 --- .../biz/master/dto/quotation/ApiQuotationItemResponse.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemResponse.java index fbde5e59..05891c72 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemResponse.java @@ -14,4 +14,7 @@ public class ApiQuotationItemResponse { @Schema(description = "수량") public Integer amount; + + @Schema(description = "아이템 타입 코드") + public String itemTpCd; } From a641c64430b28aa651542101ded3e9f3a90f9363 Mon Sep 17 00:00:00 2001 From: cha Date: Mon, 14 Apr 2025 13:16:39 +0900 Subject: [PATCH 11/11] =?UTF-8?q?975-=20=EC=95=84=EC=9D=B4=ED=85=9C(?= =?UTF-8?q?=EC=96=91=EB=8B=A8=EC=BC=80=EC=9D=B4=EB=B8=94)=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=BD=94=EB=93=9C=20sql,=20req,=20res,=20ser=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 --- .../java/com/interplug/qcast/biz/estimate/dto/ItemRequest.java | 3 +++ .../com/interplug/qcast/biz/estimate/dto/ItemResponse.java | 3 +++ src/main/resources/mappers/estimate/estimateMapper.xml | 3 +++ 3 files changed, 9 insertions(+) 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 d9a1e4d6..00237d39 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 @@ -106,4 +106,7 @@ public class ItemRequest { @Schema(description = "사용자아이디") private String userId; + + @Schema(description = "아이템 타입 코드") + public String itemTpCd; } diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java index 2bf662d4..452016a2 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/ItemResponse.java @@ -85,4 +85,7 @@ public class ItemResponse { @Schema(description = "회로구성도") private String circuitCfg; + + @Schema(description = "아이템 타입 코드") + public String itemTpCd; } diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 824d4791..0a0d4c3d 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -283,6 +283,7 @@ , PEI.OPEN_FLG , PEI.ITEM_CHANGE_FLG , PEI.DISP_CABLE_FLG + , PEI.ITEM_TP_CD , I.PNOW_W , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_' WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY' @@ -838,6 +839,7 @@ , OPEN_FLG , ITEM_CHANGE_FLG , DISP_CABLE_FLG + , ITEM_TP_CD ) VALUES ( #{objectNo} , #{planNo} @@ -856,6 +858,7 @@ , #{openFlg} , #{itemChangeFlg} , #{dispCableFlg} + , #{itemTpCd} )