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 @@
+
@@ -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,