From 8a85057c16304a6cd15647f4c517206194838792 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 07:44:40 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java  | 7 +++++--
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml   | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

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 2eca2f09f..70e73cd10 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
@@ -382,8 +382,11 @@ public class EmisWaybill extends BaseEntity
     private String transLineTypeName;
     private String productTypeName;
 
-    /* 寄件客户客户名称 */
-//    private String customerName;
+
+    /* 录单站点 */
+    private String registerSiteName;
+    /* 录单人 */
+    private String registerManName;
 
     // 取件员 ,操作员
     private String takePieceEmployeeName;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index c282f86b6..d2eb1c572 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -197,6 +197,10 @@
         <association property="takePieceEmployeeName"    column="take_piece_employee_code" select="selectEmpNameByCode"/>
         <association property="operateEmployeeName"    column="operate_employee_code" select="selectEmpNameByCode"/>
 
+        <association property="registerSiteName"    column="register_site_code" select="selectSiteNameByCode"/>
+        <association property="registerManName"    column="register_man_code" select="selectEmpNameByCode"/>
+
+
     </resultMap>
 
     <select id="selectDestNameByCode" parameterType="String" resultType="string">