From 5a13ddf5eea577e4af181d7af3f1fb6a64e10f1b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 17 May 2024 06:57:01 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java  | 7 +++++++
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java   | 6 ++++++
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml   | 2 ++
 3 files changed, 15 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 2ee61d482..27beae335 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
@@ -383,6 +383,13 @@ public class EmisWaybill extends BaseEntity
     private String printManName;
     private String printSiteName;
 
+    // 销售,回款
+    private String salesmenName;
+    private String payeeName;
+
+
+
+
 
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 9b4858adb..a3d2cfb52 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -277,6 +277,10 @@ public class WaybillOrder  implements Serializable {
     private String printManName;
     private String printSiteName;
 
+    // 销售,回款
+    private String salesmenName;
+    private String payeeName;
+
 
     /**
      * 转 VO
@@ -352,6 +356,8 @@ public class WaybillOrder  implements Serializable {
         voItem.setDispatchManName(dbWaybill.getDispatchManName());
         voItem.setPrintManName(dbWaybill.getPrintManName());
         voItem.setPrintSiteName(dbWaybill.getPrintSiteName());
+        voItem.setSalesmenName(dbWaybill.getSalesmenName());
+        voItem.setPayeeName(dbWaybill.getPayeeName());
 
 
 //        voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode());
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d7cf379d4..59c36a125 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -186,6 +186,8 @@
         <association property="printSiteName"    column="print_site" select="selectSiteNameByCode"/>
         <association property="printManName"    column="print_man_code" select="selectEmpNameByCode"/>
 
+        <association property="salesmenName"    column="salesmen" select="selectEmpNameByCode"/>
+        <association property="payeeName"    column="payee" select="selectEmpNameByCode"/>
 
     </resultMap>