aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 查询运单详情返回客户主账号，打通oms-tms主账号\子账号关联关系

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-09-05 10:59:41 +08:00
parent e2329974b0
commit 07b485e464
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -69,6 +69,8 @@ public class EmisWaybill extends BaseEntity {
private String customerCode; private String customerCode;
/* 客户类型 1-普通客户 2-月结客户 */ /* 客户类型 1-普通客户 2-月结客户 */
private String customerType; private String customerType;
/* 主账号id */
private Long mainUserId;
/* 客户客户名称 */ /* 客户客户名称 */
private String customerName; private String customerName;
/* wx openid */ /* wx openid */

9
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -71,6 +71,9 @@ public class WaybillOrder implements Serializable {
/* 客户类型 1-普通客户 2-月结客户 */ /* 客户类型 1-普通客户 2-月结客户 */
private String customerType; private String customerType;
/* 主账号id */
private Long mainUserId;
/* 支付方式 : 现金或月结 */ /* 支付方式 : 现金或月结 */
private String paymentType; private String paymentType;
@ -422,7 +425,7 @@ public class WaybillOrder implements Serializable {
/** /**
* 转 VO * 转 VO
* *
* @param dbWaybill * @param dbWaybill
* @param dbCargoList * @param dbCargoList
* @param dbFeeitemList * @param dbFeeitemList
@ -518,6 +521,7 @@ public class WaybillOrder implements Serializable {
voItem.setCustomerCode(dbWaybill.getCustomerCode()); voItem.setCustomerCode(dbWaybill.getCustomerCode());
voItem.setCustomerName(dbWaybill.getCustomerName()); voItem.setCustomerName(dbWaybill.getCustomerName());
voItem.setCustomerType(dbWaybill.getCustomerType()); voItem.setCustomerType(dbWaybill.getCustomerType());
voItem.setMainUserId(dbWaybill.getMainUserId());
voItem.setSendSiteName(dbWaybill.getSendSiteName()); voItem.setSendSiteName(dbWaybill.getSendSiteName());
voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName()); voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName()); voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
@ -712,7 +716,7 @@ public class WaybillOrder implements Serializable {
/** /**
* 转为数据库类型值 * 转为数据库类型值
* *
* @return * @return
*/ */
public EmisWaybill toDb() { public EmisWaybill toDb() {
@ -746,6 +750,7 @@ public class WaybillOrder implements Serializable {
dbWaybill.setOrderDate(this.getOrderDate()); dbWaybill.setOrderDate(this.getOrderDate());
dbWaybill.setUserId(this.getUserId()); dbWaybill.setUserId(this.getUserId());
dbWaybill.setCustomerCode(this.getCustomerCode()); dbWaybill.setCustomerCode(this.getCustomerCode());
dbWaybill.setMainUserId(this.getMainUserId());
// 虚拟单 // 虚拟单
dbWaybill.setBlVirtual(this.getBlVirtual()); dbWaybill.setBlVirtual(this.getBlVirtual());

2
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -231,6 +231,7 @@
<result property="customerNickName" column="customer_nick_name" /> <result property="customerNickName" column="customer_nick_name" />
<result property="customerAvatar" column="customer_avatar" /> <result property="customerAvatar" column="customer_avatar" />
<result property="customerType" column="customer_type" /> <result property="customerType" column="customer_type" />
<result property="mainUserId" column="main_user_id" />
<result property="blVirtual" column="bl_virtual" /> <result property="blVirtual" column="bl_virtual" />
<result property="masterBillCode" column="master_bill_code" /> <result property="masterBillCode" column="master_bill_code" />
@ -444,6 +445,7 @@
a3.sales_support , a3.sales_support ,
a3.sales_executive , a3.sales_executive ,
a3.customer_type as customer_type, a3.customer_type as customer_type,
a3.main_user_id ,
p.emp_name as dispatch_man_name,q.site_name as print_site_name, p.emp_name as dispatch_man_name,q.site_name as print_site_name,
r.emp_name as print_man_name, r.emp_name as print_man_name,