From 7ff25d2de695e9cf502d155ade8ff4dd23e23762 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 7 May 2025 13:25:55 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=B5=B7=E8=BF=90=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E8=B5=B7=E8=BF=90=E6=B8=AF=E7=9B=AE=E7=9A=84=E6=B8=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=90=8D=E7=A7=B0=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java | 8 ++++++--
 .../erp/emis/service/impl/EmisSettleBillServiceImpl.java  | 4 ++--
 .../resources/mapper/EmisSettleSubBillFeeitemMapper.xml   | 6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

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 700e1e3ab..0ac374adc 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
@@ -953,8 +953,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"
         <result property="companyCode" column="company_code"/>
         <result property="departurePort" column="departure_port"/>
         <result property="destinationPort" column="destination_port"/>
+        <result property="departurePortName"    column="departure_port_name"    />
+        <result property="destinationPortName"    column="destination_port_name"    />
         <result property="boxQuantity" column="box_quantity"/>
         <result property="parcelQty" column="parcel_qty"/>
         <result property="billWeight" column="bill_weight"/>
@@ -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'
     </sql>
 
     <select id="selectFeeitemListBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillFeeitemResult">