From a682efbd2b2ccdbff91d80ab043923031da8e64e Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 8 Apr 2025 16:28:49 +0900 Subject: [PATCH] =?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