diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java index d235638a..a73bf774 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java @@ -87,4 +87,14 @@ public class WmsReceivableVo { // 客户编号 private String customerCode; + + /** + * 订单编号 + */ + private String orderCode; + + /** + * 订单名称 + */ + private String orderName; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml index 0218b8fa..181b8020 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml @@ -37,9 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.update_time, r.update_by, c.company_name as customerName, - c.customer_code as customerCode + c.customer_code as customerCode, + o.order_code as orderCode, + o.contract_name as orderName from wms_receivable r left join crm_customer c on r.customer_id = c.customer_id and c.del_flag = 0 + left join crm_order o on r.order_id = o.order_id and o.del_flag = 0 ${ew.customSqlSegment}