|
|
@@ -1881,7 +1881,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
.append(item.getQuantity()).append(item.getPackingUnit()).append("/")
|
|
|
.append(item.getGrossWeight()).append(item.getPackingUnit()).append("/")
|
|
|
.append(item.getMeasurement()).append("CBM");
|
|
|
- cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo());
|
|
|
+ if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())){
|
|
|
+ cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append(" ");
|
|
|
+ }
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|
|
|
@@ -1994,7 +1996,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
|
|
|
.append(item.getQuantity()).append(item.getPackingUnit()).append("/")
|
|
|
.append(item.getGrossWeight()).append(item.getPackingUnit()).append("/")
|
|
|
.append(item.getMeasurement()).append("CBM");
|
|
|
- cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo());
|
|
|
+ if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())){
|
|
|
+ cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append(" ");
|
|
|
+ }
|
|
|
}
|
|
|
bills.setCntryString(text.toString());
|
|
|
bills.setCntrSealNo(cntrSealNo.toString());
|