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

Merge pull request 'dev' (#324) from dev into dev-deploy

Browse Source 
Reviewed-on: #324
This commit is contained in:
qcast3 2026-01-14 14:37:17 +09:00
commit b9626f4ae3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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