qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'QCast API #886 견적서 Excel, Pdf 다운시 Open 제품은 단가 필드에 OPEN 텍스트로 보여주도록' (#10) from feature/qcast-886 into dev

Browse Source 
Reviewed-on: #10
This commit is contained in:
basssy 2025-04-08 16:34:43 +09:00
commit b3acee760d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1409,6 +1409,11 @@ public class EstimateService {
itemResponse.setSalePrice(""); itemResponse.setSalePrice("");
itemResponse.setSaleTotPrice(""); 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); quoteList.add(estimateSendResponse);
estimateSendRequest.setQuoteList(quoteList); estimateSendRequest.setQuoteList(quoteList);
//2차점명 // 2차점명
estimateSendResponse.setSecSapSalesStoreCd(estimateRequest.getSecSapSalesStoreCd()); estimateSendResponse.setSecSapSalesStoreCd(estimateRequest.getSecSapSalesStoreCd());
} }
@ -2254,7 +2259,7 @@ public class EstimateService {
if (StringUtils.isEmpty(priceRequest.getSapSalesStoreCd())) { if (StringUtils.isEmpty(priceRequest.getSapSalesStoreCd())) {
throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, 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 */ /* [1]. QSP API (url + param) Setting */
String url = QSP_API_URL + "/api/master/agencyCustList"; String url = QSP_API_URL + "/api/master/agencyCustList";
String apiUrl = UriComponentsBuilder.fromHttpUrl(url) String apiUrl = UriComponentsBuilder.fromHttpUrl(url)
.queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString(); .queryParam("sapSalesStoreCd", priceRequest.getSapSalesStoreCd()).build().toUriString();
/* [2]. QSP API CALL -> Response */ /* [2]. QSP API CALL -> Response */
String strResponse = interfaceQsp.callApi(HttpMethod.GET, apiUrl, null); String strResponse = interfaceQsp.callApi(HttpMethod.GET, apiUrl, null);
if (!"".equals(strResponse)) { if (!"".equals(strResponse)) {
com.fasterxml.jackson.databind.ObjectMapper om = com.fasterxml.jackson.databind.ObjectMapper om =
new com.fasterxml.jackson.databind.ObjectMapper() new com.fasterxml.jackson.databind.ObjectMapper()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
response = om.readValue(strResponse, EstimateApiResponse.class); response = om.readValue(strResponse, EstimateApiResponse.class);
} else { } else {
// [msg] No data // [msg] No data