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

feature/jp-0331 #526

Open
jungpyo2001 wants to merge 998 commits from feature/jp-0331 into main
pull from: feature/jp-0331
merge into: qcast3:main
Conversation 0 Commits 998 Files Changed 12805 +15 -5
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48dadf4dd7 - Show all commits

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

@ -1342,10 +1342,15 @@ public class EstimateService {
elm.text(StringUtils.defaultString(data.getObjectName()));
elm = doc.getElementById("objectNo1");
elm.text(StringUtils.defaultString(data.getObjectNo()));
elm.text(
StringUtils.defaultString(data.getObjectNo())
+ " / "
+ StringUtils.defaultString(data.getPlanNo()));
/*
elm = doc.getElementById("planNo");
elm.text(StringUtils.defaultString(data.getPlanNo()));
*/
elm = doc.getElementById("estimateDate");
elm.text(StringUtils.defaultString(data.getEstimateDate()));
@ -1432,8 +1437,13 @@ public class EstimateService {
elm = doc.getElementById("totPrice1");
elm.text(StringUtils.defaultString(data.getTotPrice()));
elm = doc.getElementById("remarks");
elm.text(StringUtils.defaultString(data.getRemarks()));
if (!StringUtils.isEmpty(data.getRemarks())) {
elm = doc.getElementById("remarks");
elm.text(StringUtils.defaultString(data.getRemarks()));
} else {
elm = doc.getElementById("remarks");
elm.remove();
}
// 견적서 특이사항 목록 설정
if (data.getNoteList() != null) {

4
src/main/resources/template/pdf/pdf_download_quotation_detail_template.html
View File

@ -372,10 +372,10 @@
<span class="tit">見積書番号 :</span>
<span id="objectNo1"></span>
</div>
<div class="product-count">
<!--<div class="product-count">
<span class="tit">プラン :</span>
<span id="planNo"></span>
</div>
</div>-->
</div>
<div class="product-form">
<span class="tit">日付 :</span>