From 3f857f8425f4c7c2eda976ecf9b252fc31039031 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 21 Jul 2024 10:52:13 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java | 8 ++++++++
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml  | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 586a5445a..4dd75458a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -488,12 +488,20 @@ public class EmisWaybill extends BaseEntity
 
     @TableField(exist = false)
     private String sendSiteName;
+    @TableField(exist = false)
+    private String sendCenterName;
+
     // 目的地名称
     @TableField(exist = false)
     private String destinationName;
+
     // 目的网点名称
     @TableField(exist = false)
     private String dispatchUnderlingSiteName;
+    /* 目的地中心代码 */
+    @TableField(exist = false)
+    private String destinationCenterName;
+
 
     // 派件网点名称,派件人
     @TableField(exist = false)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index b8f42d74c..1acb0aa3a 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -184,6 +184,8 @@
         <result property="productTypeName"    column="product_type_name"    />
         <result property="transLineTypeName"    column="trans_line_type_name"    />
         <result property="sendSiteName"    column="send_site_name"    />
+        <result property="sendCenterName"    column="send_center_name"    />
+        <result property="destinationCenterName"    column="destination_center_name"    />
         <result property="dispatchUnderlingSiteName"    column="dispatch_underling_site_name"    />
 
         <result property="destinationName"    column="destination_name"    />
@@ -379,6 +381,8 @@
             j.prod_name as product_type_name,k.line_name  as trans_line_type_name,
             l.site_name as send_site_name,m.site_name as dispatch_underling_site_name,
             n.dest_name as destination_name,o.site_name as dispatch_site_name,
+            a1.site_name as send_center_name,
+            a2.site_name as destination_center_name,
             p.emp_name as dispatch_man_name,q.site_name as print_site_name,
             r.emp_name as print_man_name,
             s.emp_name as take_piece_employee_name,
@@ -420,6 +424,8 @@
           left join emis_site x on a.next_site_code=x.site_code
           left join emis_site y on a.last_site_code=y.site_code
           left join emis_problem_type z on a.problem_type=z.id
+          left join emis_site a1 on a.send_center_code=a1.site_code
+          left join emis_site a2 on a.destination_center_code=a2.site_code
 
     </sql>