销售订单管理列表
This commit is contained in:
@@ -6,22 +6,28 @@
|
||||
<select id="selectPageVo" resultType="com.yxt.sales.biz.smssalesbill.SmsSalesBillVo">
|
||||
SELECT
|
||||
s.sid,
|
||||
s.deptName,
|
||||
date_format (s.createTime,'%Y-%m-%d') as createTime,
|
||||
s.createByName,
|
||||
s.billTypeValue,
|
||||
date_format ( s.createTime, '%Y-%m-%d' ) AS createTime,
|
||||
s.billNo,
|
||||
sh.shopName,
|
||||
s.warehouseName,
|
||||
l.deliveryTypeValue,
|
||||
l.logisticsName,
|
||||
s.salesName,
|
||||
s.customerName,
|
||||
a.thisPay,
|
||||
a.discountAmount,
|
||||
a.dueAmount,
|
||||
a.freight,
|
||||
s.salesName
|
||||
p.shipperName,
|
||||
p.shipperMob,
|
||||
s.remarks,
|
||||
CONCAT(
|
||||
IFNULL( p.deliveryProvince, '' ),
|
||||
IFNULL( p.deliveryCity, '' ),
|
||||
IFNULL( p.deliveryCounty, '' ),
|
||||
IFNULL( p.deliveryAddress, '' )) AS deliveryAddress
|
||||
FROM
|
||||
sms_sales_bill AS s
|
||||
LEFT JOIN sms_sales_bill_logistics AS l ON s.sid = l.billSid
|
||||
LEFT JOIN sms_sales_bill_amount as a ON s.sid = a.billSid
|
||||
LEFT JOIN sms_sales_bill_shop AS sh ON s.sid = sh.billSid
|
||||
LEFT JOIN sms_sales_billshipper AS p ON s.sid = p.billSid
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
|
||||
@@ -48,30 +48,30 @@ import lombok.Data;
|
||||
@Data
|
||||
@ApiModel(value = "销售订单 查询条件", description = "销售订单 查询条件")
|
||||
public class SmsSalesBillQuery implements Query {
|
||||
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("制单部门")
|
||||
private String deptName; // 制单部门
|
||||
@ApiModelProperty("单据编号")
|
||||
@ApiModelProperty("单据编号")
|
||||
private String billNo; // 单据编号
|
||||
@ApiModelProperty("制单开始日期")
|
||||
private String startDate; // 制单开始日期
|
||||
@ApiModelProperty("制单结束日期")
|
||||
private String endDate; // 制单结束日期
|
||||
@ApiModelProperty("销售姓名")
|
||||
@ApiModelProperty("销售姓名")
|
||||
private String salesName; // 销售姓名
|
||||
@ApiModelProperty("单据类型key(线下订单/预售订单等)")
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("制单部门")
|
||||
private String deptName; // 制单部门
|
||||
@ApiModelProperty("单据类型key(线下订单/预售订单等)")
|
||||
private String billTypeKey; // 单据类型key(线下订单/预售订单等)
|
||||
@ApiModelProperty("配送方式")
|
||||
private String deliveryTypeKey; // 配送方式
|
||||
@ApiModelProperty("客户名称")
|
||||
@ApiModelProperty("客户名称")
|
||||
private String customerName; // 客户名称
|
||||
@ApiModelProperty("仓库名称")
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String warehouseName; // 仓库名称
|
||||
@ApiModelProperty("使用组织sid")
|
||||
@ApiModelProperty("使用组织sid")
|
||||
private String useOrgSid; // 使用组织sid
|
||||
@ApiModelProperty("创建组织sid")
|
||||
@ApiModelProperty("创建组织sid")
|
||||
private String createOrgSid; // 创建组织sid
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -52,32 +52,32 @@ import java.math.BigDecimal;
|
||||
public class SmsSalesBillVo implements Vo {
|
||||
|
||||
private String sid; // sid
|
||||
@ApiModelProperty("单据编号")
|
||||
private String billNo; // 单据编号
|
||||
@ApiModelProperty("制单部门")
|
||||
private String deptName; // 制单部门
|
||||
@ApiModelProperty("制单人姓名")
|
||||
private String createByName; // 制单人姓名
|
||||
@ApiModelProperty("制单日期")
|
||||
private String createTime; // 制单日期
|
||||
@ApiModelProperty("单据类型value")
|
||||
private String billTypeValue; // 单据类型value
|
||||
@ApiModelProperty("制单日期")
|
||||
private String createTime; // 制单日期
|
||||
@ApiModelProperty("单据编号")
|
||||
private String billNo; // 单据编号
|
||||
@ApiModelProperty("店铺名称")
|
||||
private String shopName; // 店铺名称
|
||||
@ApiModelProperty("仓库名称")
|
||||
private String warehouseName; // 仓库名称
|
||||
@ApiModelProperty("配送方式Value")
|
||||
private String deliveryTypeValue; // 配送方式Value
|
||||
@ApiModelProperty("客户名称")
|
||||
private String customerName; // 客户名称
|
||||
@ApiModelProperty("实付")
|
||||
private String thisPay; // 实付
|
||||
@ApiModelProperty("整体优惠金额")
|
||||
private String discountAmount; // 整体优惠金额
|
||||
@ApiModelProperty("应收合计")
|
||||
private String dueAmount; // 应收合计
|
||||
@ApiModelProperty("运费")
|
||||
private String freight; // 运费
|
||||
@ApiModelProperty("快递公司")
|
||||
private String logisticsName; // 快递公司
|
||||
@ApiModelProperty("业务员")
|
||||
private String salesName; // 业务员
|
||||
@ApiModelProperty("客户名称")
|
||||
private String customerName; // 客户名称
|
||||
@ApiModelProperty("收货人")
|
||||
private String shipperName; // 收货人
|
||||
@ApiModelProperty("手机号")
|
||||
private String shipperMob; // 手机号
|
||||
@ApiModelProperty("省/市/县/详细地址")
|
||||
private String deliveryAddress; // 省/市/县/详细地址
|
||||
@ApiModelProperty("备注")
|
||||
private String remarks; // 备注
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user