From 07b485e464d9e6f0531c1dcc7a2cd79349e830ce Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 5 Sep 2025 10:59:41 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=9F=A5=E8=AF=A2=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=AE=A2=E6=88=B7=E4=B8=BB?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E6=89=93=E9=80=9Aoms-tms=E4=B8=BB?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7\=E5=AD=90=E8=B4=A6=E5=8F=B7=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java     | 2 ++
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java | 9 +++++++--
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 2 ++
 3 files changed, 11 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 079efa6b5..1be928d1c 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
@@ -69,6 +69,8 @@ public class EmisWaybill extends BaseEntity {
     private String customerCode;
     /* 客户类型 1-普通客户 2-月结客户 */
     private String customerType;
+    /* 主账号id */
+    private Long mainUserId;
     /* 客户客户名称 */
     private String customerName;
     /* wx openid */
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 6736dbd62..0cf79b80c 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
@@ -71,6 +71,9 @@ public class WaybillOrder implements Serializable {
     /* 客户类型 1-普通客户 2-月结客户 */
     private String customerType;
 
+    /* 主账号id */
+    private Long mainUserId;
+
     /* 支付方式 : 现金或月结 */
     private String paymentType;
 
@@ -422,7 +425,7 @@ public class WaybillOrder implements Serializable {
 
     /**
      * 转 VO
-     * 
+     *
      * @param dbWaybill
      * @param dbCargoList
      * @param dbFeeitemList
@@ -518,6 +521,7 @@ public class WaybillOrder implements Serializable {
         voItem.setCustomerCode(dbWaybill.getCustomerCode());
         voItem.setCustomerName(dbWaybill.getCustomerName());
         voItem.setCustomerType(dbWaybill.getCustomerType());
+        voItem.setMainUserId(dbWaybill.getMainUserId());
         voItem.setSendSiteName(dbWaybill.getSendSiteName());
         voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
         voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
@@ -712,7 +716,7 @@ public class WaybillOrder implements Serializable {
 
     /**
      * 转为数据库类型值
-     * 
+     *
      * @return
      */
     public EmisWaybill toDb() {
@@ -746,6 +750,7 @@ public class WaybillOrder implements Serializable {
         dbWaybill.setOrderDate(this.getOrderDate());
         dbWaybill.setUserId(this.getUserId());
         dbWaybill.setCustomerCode(this.getCustomerCode());
+        dbWaybill.setMainUserId(this.getMainUserId());
 
         // 虚拟单
         dbWaybill.setBlVirtual(this.getBlVirtual());
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index a93e0e9b5..5cfc296ce 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -231,6 +231,7 @@
         <result property="customerNickName"    column="customer_nick_name"    />
         <result property="customerAvatar"    column="customer_avatar"    />
         <result property="customerType"    column="customer_type"    />
+        <result property="mainUserId"    column="main_user_id"    />
 
         <result property="blVirtual"    column="bl_virtual"    />
         <result property="masterBillCode"    column="master_bill_code"    />
@@ -444,6 +445,7 @@
             a3.sales_support ,
             a3.sales_executive ,
             a3.customer_type as customer_type,
+            a3.main_user_id ,
 
             p.emp_name as dispatch_man_name,q.site_name as print_site_name,
             r.emp_name as print_man_name,