hblno 提单详情 单独显示 箱信息

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -2647,6 +2647,13 @@ public class Bills implements Serializable {
 	private String attachedGoodsdesc;
 
 	/**
+	 * 箱封号附页
+	 */
+	@TableField(exist = false)
+	private String attachedCntr;
+
+
+	/**
 	 * 附页
 	 */
 	@TableField(exist = false)

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

@@ -1455,24 +1455,53 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setBoxWeightSum(boxWeightSum);
 				StringBuilder text = new StringBuilder();
 				StringBuilder cntrSealNo = new StringBuilder();
+				int count = 0;
 				for (Containers item : containersList) {
-					text.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("/").append(item.getCntrTypeCode()).append("<br/>")
-						.append(item.getQuantity()).append(bills.getPackingUnit()).append("<br/>")
-						.append(item.getGrossWeight()).append("KGS").append("/")
-						.append(item.getMeasurement()).append("CBM").append("<br/>");
+					boolean isLast = (count == containersList.size() - 1);
+
+					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("  ");
+					if (isLast) {
+						text.append(item.getMeasurement()).append("CBM");
+					} 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("  ");
+						cntrSealNo.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("  ");
 					}
 				}
 				bills.setCntryString(text.toString());
-				bills.setCommodityDescr(bills.getCommodityDescr());
+
+				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.getCapitalLetters());
+
+				bills.setCommodityDescr(textCommodity.toString());
+
 
 /*
 				+"SHIPPER'S LOAD,COUNT & SEAL"+bills.getQuantityCntrDescr()+"CONTAINER S.T.C"
 					+bills.getHpaymode()+bills.getServiceTerms()+bills.getCapitalLetters()
 */
 
-				bills.setMarks(bills.getMarks() + "<br/><br/>" + bills.getCntryString());
+				bills.setMarks(bills.getMarks());//+ bills.getCntryString() + "<br/><br/>"
 				bills.setCntrSealNo(cntrSealNo.toString());
 				bills.setDept(dept);
 				map.put(MagicValues.DATA, bills);