Browse Source
销售出货通知前端列表页面：列表隐藏从【不含税总价(RMB)】至【含税总价】的字段 新增 导出销售出货单主表和子表数据实体类 修改销售出货通知导出全部和导出选择的数据的接口：统一调用导出销售出货通知单明细方法 新增 导出销售出货通知单明细方法方法，用于给导出销售出货单主表和子表数据实体类进行赋值操作，实现一个销售出货通知主表对应一条子表的形式 修改 根据出库单号批量查询销售出库详情方法，传入的集合加上非空判断dev
6 changed files with 331 additions and 65 deletions
@ -0,0 +1,190 @@ |
|||||
|
package com.ruoyi.system.domain.Vo; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
|
import com.ruoyi.common.annotation.Excel; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.math.BigDecimal; |
||||
|
import java.util.Date; |
||||
|
|
||||
|
/** |
||||
|
* 导出销售出货单主表和子表数据 |
||||
|
* */ |
||||
|
@Data |
||||
|
public class ExportSalesShippingInformDetailVo { |
||||
|
|
||||
|
/** 出库单号 */ |
||||
|
@Excel(name = "出库单号") |
||||
|
private String outOrderCode; |
||||
|
|
||||
|
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") |
||||
|
private Date createTime; |
||||
|
|
||||
|
/** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消） */ |
||||
|
// @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消")
|
||||
|
@Excel(name = "出库状态", dictType = "warehouse_out_status") |
||||
|
private String warehouseOutStatus; |
||||
|
|
||||
|
/** 关联销售订单号 */ |
||||
|
@Excel(name = "关联销售订单号") |
||||
|
private String salesOrderCode; |
||||
|
|
||||
|
/** 出库类型（0销售出库、1生产领料、2员工领料、3委外领料、4公司退货出库、5开发领料） */ |
||||
|
@Excel(name = "出库类型", dictType = "warehouse_out_type") |
||||
|
private String warehouseOutType; |
||||
|
|
||||
|
|
||||
|
/** 客户代码/id */ |
||||
|
@Excel(name = "客户ID") |
||||
|
private String customerId; |
||||
|
|
||||
|
/** 客户名称 */ |
||||
|
@Excel(name = "客户名称") |
||||
|
private String customerName; |
||||
|
|
||||
|
/** 业务员 */ |
||||
|
@Excel(name = "业务员") |
||||
|
private String businessMembers; |
||||
|
|
||||
|
/** 物料合计 */ |
||||
|
@Excel(name = "物料合计") |
||||
|
private Integer materialSum; |
||||
|
|
||||
|
/** 数量合计 */ |
||||
|
@Excel(name = "数量合计") |
||||
|
private Integer enterpriseSum; |
||||
|
|
||||
|
/** 收货联系人 */ |
||||
|
@Excel(name = "收货联系人(Ship To)") |
||||
|
private String customerContact; |
||||
|
|
||||
|
/** 联系电话 */ |
||||
|
@Excel(name = "收货联系人电话(Ship To)") |
||||
|
private String contactNumber; |
||||
|
|
||||
|
/** 收货地址 */ |
||||
|
@Excel(name = "收货地址(Ship To)") |
||||
|
private String customerContactAddress; |
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
/** 收货联系人 */ |
||||
|
@Excel(name = "收货联系人(Bill To)") |
||||
|
private String customerContactBillto; |
||||
|
|
||||
|
/** 联系电话 */ |
||||
|
@Excel(name = "联系电话(Bill To)") |
||||
|
private String contactNumberBillto; |
||||
|
|
||||
|
/** 收货地址 */ |
||||
|
@Excel(name = "收货地址(Bill To)") |
||||
|
private String contactAddressBillto; |
||||
|
|
||||
|
|
||||
|
|
||||
|
/** 不含税总价（RMB） */ |
||||
|
@Excel(name = "不含税总价") |
||||
|
private BigDecimal allPriceExcludingTaxRmb; |
||||
|
|
||||
|
/** 不含税总价（美元） */ |
||||
|
@Excel(name = "不含税总价") |
||||
|
private BigDecimal allPriceExcludingTaxDollar; |
||||
|
|
||||
|
/** 含税总价（RMB） */ |
||||
|
@Excel(name = "含税总价") |
||||
|
private BigDecimal allPriceIncludesTax; |
||||
|
|
||||
|
/** 计划交付时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "计划交付时间", dateFormat = "yyyy-MM-dd") |
||||
|
private Date plannedDeliveryTime; |
||||
|
|
||||
|
/** 客户验收时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "客户验收时间", dateFormat = "yyyy-MM-dd") |
||||
|
private Date acceptanceTime; |
||||
|
|
||||
|
/** 付款条件 */ |
||||
|
@Excel(name = "付款条件") |
||||
|
private String paymentCondition; |
||||
|
|
||||
|
/** 交付条件 */ |
||||
|
@Excel(name = "交付条件") |
||||
|
private String deliveryCondition; |
||||
|
|
||||
|
/** 送货日期 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "送货日期", dateFormat = "yyyy-MM-dd") |
||||
|
private Date deliverTime; |
||||
|
|
||||
|
/** 料号 */ |
||||
|
@Excel(name = "料号") |
||||
|
private String materialNo; |
||||
|
|
||||
|
/** 物料名称 */ |
||||
|
@Excel(name = "物料名称") |
||||
|
private String materialName; |
||||
|
|
||||
|
/** 物料图片地址 */ |
||||
|
@Excel(name = "物料图片地址") |
||||
|
private String materialPhotourl; |
||||
|
|
||||
|
/** 物料品牌 */ |
||||
|
@Excel(name = "物料品牌") |
||||
|
private String materialBrand; |
||||
|
|
||||
|
/** 物料单位 */ |
||||
|
@Excel(name = "物料单位") |
||||
|
private String materialUnit; |
||||
|
|
||||
|
/** 物料描述 */ |
||||
|
@Excel(name = "物料描述") |
||||
|
private String materialDescribe; |
||||
|
|
||||
|
/** 物料加工方式 */ |
||||
|
@Excel(name = "物料加工方式",dictType = "processMethod") |
||||
|
private String materialProcessMethod; |
||||
|
|
||||
|
/** 物料型号 */ |
||||
|
@Excel(name = "物料型号") |
||||
|
private String materialModel; |
||||
|
|
||||
|
/** 订单数 */ |
||||
|
@Excel(name = "订单数") |
||||
|
private Integer makeNum; |
||||
|
|
||||
|
/** 本次出货数 */ |
||||
|
@Excel(name = "本次出货数") |
||||
|
private Integer thisShippingNum; |
||||
|
|
||||
|
/** 已出库数 */ |
||||
|
@Excel(name = "已出库数") |
||||
|
private Integer hasOutOrderNum; |
||||
|
|
||||
|
/** 本次验收数 */ |
||||
|
@Excel(name = "本次验收数") |
||||
|
private Integer thisCheckNum; |
||||
|
|
||||
|
/** 已验收数 */ |
||||
|
@Excel(name = "已验收数") |
||||
|
private Integer hasCheckNum; |
||||
|
|
||||
|
/** 已申请出货数 */ |
||||
|
@Excel(name = "已申请出货数") |
||||
|
private Integer hasShippingNum; |
||||
|
|
||||
|
/** 已完成数 */ |
||||
|
@Excel(name = "已完成数") |
||||
|
private Integer hasCompleteNum; |
||||
|
|
||||
|
/** 本次收货数 */ |
||||
|
@Excel(name = "本次收货数") |
||||
|
private Integer thisReceivingNum; |
||||
|
|
||||
|
/** 已收货数 */ |
||||
|
@Excel(name = "已收货数") |
||||
|
private Integer hasReceivingNum; |
||||
|
|
||||
|
|
||||
|
} |
||||
Loading…
Reference in new issue