diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
index 8ce992dea..0b40219e5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
@@ -63,6 +63,8 @@ public class EmisSettleSubBill extends BaseEntity
private String billMonth;
/* 月结编号 */
private String custNo;
+ /* 月结客户名称 */
+ private String custName;
/* 客户编码 */
private String customerCode;
/* 客户名称 */
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 9083d0c54..6db94d2cd 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
@@ -72,6 +72,7 @@ public class WaybillOrder implements Serializable {
/* 支付月结编号 */
private String custNo;
+ private String custName;
/* 快递线路 */
private String transLine;
@@ -468,6 +469,7 @@ public class WaybillOrder implements Serializable {
voItem.setPaymentType(dbWaybill.getPaymentType());
voItem.setCalcFeeType(dbWaybill.getCalcFeeType());
voItem.setCustNo(dbWaybill.getCustNo());
+ voItem.setCustName(dbWaybill.getCustName());
voItem.setTransLine(dbWaybill.getTransLineType());
voItem.setProductType(dbWaybill.getProductType());
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 0fedb301a..7d44ce716 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -60,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
+ select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill