Compare commits

..

No commits in common. "b9626f4ae3e13d7eb421a15b254a2aad97d2a2aa" and "78861015dbfe0616cc4d490077b786d7e80f1d8f" have entirely different histories.

View File

@ -1670,10 +1670,9 @@ public class EstimateService {
String createStoreId = estimateRequest.getCreateStoreId();
String hiddenYn = "N";
if(storeLvl != null && !storeLvl.equals("1")){
if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) {
hiddenYn = "Y";
if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
hiddenYn = 'Y';
//templateFilePath = "pdf_download_quotation_detail_template2.html";
}
}
@ -2144,14 +2143,14 @@ public class EstimateService {
+ "</td>");
sb.append(
"<td class='hide-column' style='width:80px;text-align:right;'>"
+ ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSalePrice()) : "")
+ !"Y".equals(hiddenYn) ? 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;'>"
+ ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "") + "</td>");
+ !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "" + "</td>");
sb.append("</tr>");
}
if ("Y".equals(data.getPkgYn())) {
@ -2165,7 +2164,7 @@ public class EstimateService {
+ StringUtils.defaultString(data.getTotVol()) + "</td>");
sb.append("<td style='width:60px;'>W</td>");
sb.append("<td style='width:80px;text-align:right;'>"
+ ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(data.getPkgTotPrice()) : "") + "</td>");
+ !"Y".equals(hiddenYn) ? StringUtils.defaultString(data.getPkgTotPrice()) : "" + "</td>");
sb.append("</tr>");
}
elm = doc.getElementById("itemList_detail");