Browse Source

如果港口 print 为空 覆盖

lijunping 5 months ago
parent
commit
d7c1b14337

+ 12 - 0
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1293,13 +1293,25 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setPolCode(bills.getPolCode());
 				item.setPolCode(bills.getPolCode());
 				item.setPolCnName(bills.getPolCnName());
 				item.setPolCnName(bills.getPolCnName());
 				item.setPolEnName(bills.getPolEnName());
 				item.setPolEnName(bills.getPolEnName());
+
+				if (ObjectUtils.isNull(item.getPolNamePrint())) {
+					item.setPolNamePrint(bills.getPolNamePrint());
+				}
 				item.setPodId(bills.getPodId());
 				item.setPodId(bills.getPodId());
 				item.setPodCode(bills.getPodCode());
 				item.setPodCode(bills.getPodCode());
 				item.setPodCnName(bills.getPodCnName());
 				item.setPodCnName(bills.getPodCnName());
 				item.setPodEnName(bills.getPodEnName());
 				item.setPodEnName(bills.getPodEnName());
+
+				if (ObjectUtils.isNull(item.getPodNamePrint())) {
+					item.setPodNamePrint(bills.getPodNamePrint());
+				}
 				item.setPlaceDeliveryId(bills.getPlaceDeliveryId());
 				item.setPlaceDeliveryId(bills.getPlaceDeliveryId());
 				item.setPlaceDeliveryName(bills.getPlaceDeliveryName());
 				item.setPlaceDeliveryName(bills.getPlaceDeliveryName());
 				item.setPlaceDeliveryCode(bills.getPlaceDeliveryCode());
 				item.setPlaceDeliveryCode(bills.getPlaceDeliveryCode());
+
+				if (ObjectUtils.isNull(item.getPlaceDeliveryNamePrint())) {
+					item.setPlaceDeliveryNamePrint(bills.getPlaceDeliveryNamePrint());
+				}
 				item.setIssueAtId(bills.getIssueAtId());
 				item.setIssueAtId(bills.getIssueAtId());
 				item.setIssueAt(bills.getIssueAt());
 				item.setIssueAt(bills.getIssueAt());
 				item.setMblno(bills.getMblno());
 				item.setMblno(bills.getMblno());