Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1467,18 +1467,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					} else {
 						text.append(item.getMeasurement()).append("CBM").append("<br/>");
 					}
-
-/*					if (isLast) {
-						text.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("  ").append(item.getCntrTypeCode()).append("  ")
-							.append(item.getQuantity()).append(bills.getPackingUnit()).append("  ")
-							.append(item.getGrossWeight()).append("KGS").append("  ")
-							.append(item.getMeasurement()).append("CBM");
-					} else {
-						text.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("  ").append(item.getCntrTypeCode()).append("  ")
-							.append(item.getQuantity()).append(bills.getPackingUnit()).append("  ")
-							.append(item.getGrossWeight()).append("KGS").append("  ")
-							.append(item.getMeasurement()).append("CBM").append("<br/>");
-					}*/
 					count++;
 					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
 						cntrSealNo.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("  ");
@@ -1489,8 +1477,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				StringBuilder textCommodity = new StringBuilder();
 				textCommodity.append(bills.getCommodityDescr()).append("<br/>").append("<br/>")
 					.append("SHIPPER'S LOAD,COUNT & SEAL").append("<br/>")
-					.append(bills.getQuantityCntrDescr()).append("CONTAINER S.T.C").append("<br/>")
-					.append(bills.getHpaymode()).append(bills.getServiceTerms()).append("<br/>")
+					.append(bills.getQuantityCntrDescr()).append("  ").append("CONTAINER S.T.C").append("<br/>")
+					.append(bills.getHpaymode()).append("  ").append(bills.getServiceTerms()).append("<br/>")
 					.append(bills.getCapitalLetters());
 
 				bills.setCommodityDescr(textCommodity.toString());