diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java
index 7a6132aaf..e4ba45987 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java
@@ -55,13 +55,17 @@ public class EmisWaybillAndFeeitem extends BaseEntity
@DataAuditField(fieldComment = "贵司编号(记录相关业务的贵司编号)")
private String companyCode ;
+ private String departurePort ;
+
+ private String destinationPort;
+
@TableField
@DataAuditField(fieldComment = "起运港")
- private String departurePort ;
+ private String departurePortName ;
@TableField
@DataAuditField(fieldComment = "目的港")
- private String destinationPort;
+ private String destinationPortName;
@TableField
@DataAuditField(fieldComment = "箱量")
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index cfbd8e981..29b1a97fd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -1043,8 +1043,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
calculateSubtotal(settleSubBillFeeitemList, subtotalMap);
settleSubBillFeeitemList.forEach(item -> {
result.add(Lists.newArrayList(emisWaybill.getLadingBillCode(), emisWaybill.getBillCode(),
- emisWaybill.getCompanyCode(), emisWaybill.getDeparturePort(),
- emisWaybill.getDestinationPort(), emisWaybill.getBoxQuantity(),
+ emisWaybill.getCompanyCode(), emisWaybill.getDeparturePortName(),
+ emisWaybill.getDestinationPortName(), emisWaybill.getBoxQuantity(),
String.valueOf(emisWaybill.getParcelQty()),
emisWaybill.getBillWeight().stripTrailingZeros().toPlainString(),
emisWaybill.getTotalVolume().stripTrailingZeros().toPlainString(),
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
index 7e5988a6b..a99c2056c 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -55,9 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.parcel_qty,
a.bill_weight,
a.total_volume,
+ seaway1.site_name as departure_port_name,
+ seaway2.site_name as destination_port_name,
b.*
from emis_waybill a
left join emis_settle_sub_bill_feeitem b on a.bill_code = b.bill_code and b.del_flag = '0'
+ left join emis_site seaway1 on a.departure_port=seaway1.site_code and seaway1.del_flag='0'
+ left join emis_site seaway2 on a.destination_port=seaway2.site_code and seaway2.del_flag='0'