|
|
@@ -1407,6 +1407,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
bills.setBoxWeightSum(boxWeightSum);
|
|
|
StringBuilder text = new StringBuilder();
|
|
|
StringBuilder cntrSealNo = new StringBuilder();
|
|
|
+ StringBuilder cntrSealNos = new StringBuilder();
|
|
|
for (Containers item : containersList) {
|
|
|
ContainersReports containersReports = new ContainersReports();
|
|
|
BeanUtil.copyProperties(item, containersReports);
|
|
|
@@ -1424,6 +1425,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
.append(item.getMeasurement()).append("CBM").append("<br/>");
|
|
|
if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
|
|
|
cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append(" ");
|
|
|
+ cntrSealNos.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("<br/>");
|
|
|
}
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
@@ -1431,6 +1433,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
+bills.getHpaymode()+bills.getServiceTerms()+bills.getCapitalLetters());*/
|
|
|
bills.setMarks(bills.getMarks() + "<br/><br/>" + bills.getCntryString());
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|
|
|
+ bills.setCntrSealNos(cntrSealNos.toString());
|
|
|
bills.setContainersReportsList(containersReportsList);
|
|
|
bills.setDept(dept);
|
|
|
map.put(MagicValues.DATA, bills);
|
|
|
@@ -1470,6 +1473,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
bills.setBoxWeightSum(boxWeightSum);
|
|
|
StringBuilder text = new StringBuilder();
|
|
|
StringBuilder cntrSealNo = new StringBuilder();
|
|
|
+ StringBuilder cntrSealNos = new StringBuilder();
|
|
|
for (Containers item : containersList) {
|
|
|
ContainersReports containersReports = new ContainersReports();
|
|
|
BeanUtil.copyProperties(item, containersReports);
|
|
|
@@ -1487,11 +1491,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
.append(item.getMeasurement()).append("CBM").append("<br/>");
|
|
|
if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
|
|
|
cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append(" ");
|
|
|
+ cntrSealNos.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("<br/>");
|
|
|
}
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
bills.setMarks(bills.getMarks() + "<br/><br/>" + bills.getCntryString());
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|
|
|
+ bills.setCntrSealNos(cntrSealNos.toString());
|
|
|
bills.setContainersReportsList(containersReportsList);
|
|
|
List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
|
|
|
.eq(Bills::getTenantId, AuthUtil.getTenantId())
|
|
|
@@ -1536,6 +1542,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
bills.setBoxWeightSum(boxWeightSum);
|
|
|
StringBuilder text = new StringBuilder();
|
|
|
StringBuilder cntrSealNo = new StringBuilder();
|
|
|
+ StringBuilder cntrSealNos = new StringBuilder();
|
|
|
int count = 0;
|
|
|
for (Containers item : containersList) {
|
|
|
boolean isLast = (count == containersList.size() - 1);
|
|
|
@@ -1551,6 +1558,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
count++;
|
|
|
if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
|
|
|
cntrSealNo.append(item.getCntrNo()).append(" ").append(item.getSealNo()).append(" ");
|
|
|
+ cntrSealNo.append(item.getCntrNo()).append(" ").append(item.getSealNo()).append("<br/>");
|
|
|
}
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
@@ -1572,6 +1580,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
|
|
|
bills.setMarks(bills.getMarks());//+ bills.getCntryString() + "<br/><br/>"
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|
|
|
+ bills.setCntrSealNos(cntrSealNos.toString());
|
|
|
bills.setDept(dept);
|
|
|
BCorps bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
if (bCorps != null) {
|
|
|
@@ -1715,6 +1724,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
} else {
|
|
|
bills.setExrate(new BigDecimal("1"));
|
|
|
}
|
|
|
+ BCorps bCorps = bCorpsService.getById(feeCenterList.get(0).getCorpId());
|
|
|
+ if (bCorps != null) {
|
|
|
+ bills.setCorpAddress1(bCorps.getCnAddr());
|
|
|
+ bills.setCorpAddressEn1(bCorps.getEnAddr());
|
|
|
+ bills.setUscc1(bCorps.getUscc());
|
|
|
+ }
|
|
|
}
|
|
|
BCorps bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
if (bCorps != null) {
|
|
|
@@ -1805,6 +1820,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
} else {
|
|
|
bills.setExrate(new BigDecimal("1"));
|
|
|
}
|
|
|
+ BCorps bCorps = bCorpsService.getById(feeCenterList.get(0).getCorpId());
|
|
|
+ if (bCorps != null) {
|
|
|
+ bills.setCorpAddress1(bCorps.getCnAddr());
|
|
|
+ bills.setCorpAddressEn1(bCorps.getEnAddr());
|
|
|
+ bills.setUscc1(bCorps.getUscc());
|
|
|
+ }
|
|
|
}
|
|
|
bills.setDept(dept);
|
|
|
BCorps bCorps = bCorpsService.getById(bills.getCorpId());
|