|
|
@@ -1337,8 +1337,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
StringBuilder text = new StringBuilder();
|
|
|
StringBuilder cntrSealNo = new StringBuilder();
|
|
|
for (Containers item : containersList) {
|
|
|
- text.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("<br/>")
|
|
|
- .append(item.getCntrTypeCode()).append(item.getQuantity()).append(item.getPackingUnit()).append("<br/>")
|
|
|
+ text.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("/").append(item.getCntrTypeCode()).append("<br/>")
|
|
|
+ .append(item.getQuantity()).append(item.getPackingUnit()).append("<br/>")
|
|
|
.append(item.getGrossWeight()).append("KGS").append("/")
|
|
|
.append(item.getMeasurement()).append("CBM").append("<br/>");
|
|
|
if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
|
|
|
@@ -1346,8 +1346,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
}
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
- bills.setCommodityDescr(bills.getCommodityDescr()+"SHIPPER'S LOAD,COUNT & SEAL"+bills.getQuantityCntrDescr()+"CONTAINER S.T.C"
|
|
|
- +bills.getHpaymode()+bills.getServiceTerms()+bills.getCapitalLetters());
|
|
|
+ bills.setCommodityDescr(bills.getCommodityDescr());
|
|
|
+
|
|
|
+/*
|
|
|
+ +"SHIPPER'S LOAD,COUNT & SEAL"+bills.getQuantityCntrDescr()+"CONTAINER S.T.C"
|
|
|
+ +bills.getHpaymode()+bills.getServiceTerms()+bills.getCapitalLetters()
|
|
|
+*/
|
|
|
+
|
|
|
bills.setMarks(bills.getMarks()+bills.getCntryString());
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|
|
|
bills.setDept(dept);
|