md
This commit is contained in:
linfso
parent
7ff3a9251d
commit
f901e94268
@ -10,10 +10,10 @@
|
||||
|
||||
package com.xdadan.erp.emis.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.xdadan.erp.common.annotation.audit.DataAuditFilter;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.xdadan.erp.common.annotation.Excel;
|
||||
@ -34,14 +34,18 @@ import lombok.Data;
|
||||
* @date 2024-04-11 05:48:01
|
||||
*/
|
||||
//@JsonInclude(JsonInclude.Include.ALWAYS.NON_NULL)
|
||||
@DataAuditFilter
|
||||
@Data
|
||||
@TableName("emis_waybill")
|
||||
public class EmisWaybill extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/* id */
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
private Long id;
|
||||
/* 订单号 */
|
||||
@TableField
|
||||
private String orderSn;
|
||||
/* 客户单号，合同号 */
|
||||
private String custOrderId;
|
||||
@ -67,64 +71,89 @@ public class EmisWaybill extends BaseEntity
|
||||
/* wx openid */
|
||||
private String openId;
|
||||
/* 收货人名 */
|
||||
@TableField
|
||||
private String receiveName;
|
||||
/* 收货公司 */
|
||||
@TableField
|
||||
private String receiveCompany;
|
||||
/* 收货人手机号 */
|
||||
@TableField
|
||||
private String receiveMobile;
|
||||
/* 收货人电话 */
|
||||
@TableField
|
||||
private String receiveTel;
|
||||
/* 收货人国家 */
|
||||
@TableField
|
||||
private String receiveCountry;
|
||||
/* 省 */
|
||||
@TableField
|
||||
private String receiveProvince;
|
||||
/* 市 */
|
||||
@TableField
|
||||
private String receiveCity;
|
||||
/* 区 */
|
||||
@TableField
|
||||
private String receiveCounty;
|
||||
/* 县 */
|
||||
@TableField
|
||||
private String receiveTown;
|
||||
/* 收货地址 */
|
||||
@TableField
|
||||
private String receiveAddress;
|
||||
/* 邮编 */
|
||||
private String receivePostcode;
|
||||
/* 寄件人省市区名称，逗号分隔 */
|
||||
private String receivePcd;
|
||||
/* 寄件人名 */
|
||||
@TableField
|
||||
private String sendName;
|
||||
/* 寄件公司 */
|
||||
@TableField
|
||||
private String sendCompany;
|
||||
/* 寄件人手机号 */
|
||||
@TableField
|
||||
private String sendMobile;
|
||||
/* 寄件人电话 */
|
||||
@TableField
|
||||
private String sendTel;
|
||||
/* 寄件人国家 */
|
||||
@TableField
|
||||
private String sendCountry;
|
||||
/* 寄件省 */
|
||||
@TableField
|
||||
private String sendProvince;
|
||||
/* 寄件市 */
|
||||
@TableField
|
||||
private String sendCity;
|
||||
/* 寄件区 */
|
||||
@TableField
|
||||
private String sendCounty;
|
||||
/* 寄件县 */
|
||||
private String sendTown;
|
||||
/* 寄件地址 */
|
||||
@TableField
|
||||
private String sendAddress;
|
||||
/* 寄件邮编 */
|
||||
private String sendPostcode;
|
||||
/* 发件人省市区名称，逗号分隔 */
|
||||
private String sendPcd;
|
||||
/* 支付方式 : 现金或月结 */
|
||||
@TableField
|
||||
private String paymentType;
|
||||
/* 计费方式 1-按重量 2-按体积 3-一口价 */
|
||||
@TableField
|
||||
private String calcFeeType;
|
||||
/* 支付月结编号 */
|
||||
@TableField
|
||||
private String custNo;
|
||||
/* 月结客户的名称 */
|
||||
@TableField
|
||||
private String custName;
|
||||
/* 快递线路 */
|
||||
@TableField
|
||||
private String transLineType;
|
||||
/* 快递产品类型 */
|
||||
@TableField
|
||||
private String productType;
|
||||
/* 时效 */
|
||||
private String timeType;
|
||||
@ -133,23 +162,31 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 取重方式 */
|
||||
private String carryType;
|
||||
/* 清关方式 */
|
||||
@TableField
|
||||
private String customsClear;
|
||||
/* 报关方式 */
|
||||
@TableField
|
||||
private String customsEclaration;
|
||||
/* 预计到达时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@TableField
|
||||
private Date estimateDate;
|
||||
/* 包装类型 */
|
||||
@TableField
|
||||
private String packType;
|
||||
/* 派件方式:1-派送 2-自提 */
|
||||
@TableField
|
||||
private String dispatchMethod;
|
||||
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
|
||||
@TableField
|
||||
private String pickupMethod;
|
||||
/* 预计上门取件开始时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@TableField
|
||||
private Date pickStartDate;
|
||||
/* 预计上门取件结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@TableField
|
||||
private Date pickFinishDate;
|
||||
/* 取货失败原因 */
|
||||
private String pickFailReason;
|
||||
@ -174,6 +211,7 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 货物大类 */
|
||||
private String goodsType;
|
||||
/* 货物描述 */
|
||||
@TableField
|
||||
private String goodsInfo;
|
||||
/* 货物图片，逗号隔开 */
|
||||
private String goodsPics;
|
||||
@ -194,28 +232,35 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 总重量 */
|
||||
private BigDecimal totalWeight;
|
||||
/* 总体积 */
|
||||
@TableField
|
||||
private BigDecimal totalVolume;
|
||||
/* 件数 */
|
||||
@TableField
|
||||
private Integer parcelQty;
|
||||
/* 实际重量 */
|
||||
@TableField
|
||||
private BigDecimal billWeight;
|
||||
/* 体积重量 */
|
||||
@TableField
|
||||
private BigDecimal volumeWeight;
|
||||
/* 费用币种 */
|
||||
private String currency;
|
||||
/* 结算重量 */
|
||||
@TableField
|
||||
private BigDecimal settlementWeight;
|
||||
/* 扫描重量 */
|
||||
private BigDecimal scanWeight;
|
||||
/* 计费重量 */
|
||||
private BigDecimal feeWeight;
|
||||
/* 运费 */
|
||||
@TableField
|
||||
private BigDecimal freight;
|
||||
/* 实际支付方式 : 现金或月结 */
|
||||
private String realPaymentType;
|
||||
/* 实收运费 */
|
||||
private BigDecimal realFee;
|
||||
/* 是否特殊报价 */
|
||||
@TableField
|
||||
private String blSpecialQuote;
|
||||
/* 是否超长 */
|
||||
private String blOverLong;
|
||||
@ -228,6 +273,7 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 超重重量 */
|
||||
private String overWeightNumber;
|
||||
/* 费用备注 */
|
||||
@TableField
|
||||
private String feeRemark;
|
||||
/* 三段码 */
|
||||
private String thirdCode;
|
||||
@ -260,10 +306,13 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 打印次数 */
|
||||
private Integer printCount;
|
||||
/* 是否同行转单 */
|
||||
@TableField
|
||||
private String blDispFd;
|
||||
/* 转单快递代码 */
|
||||
@TableField
|
||||
private String transferCode;
|
||||
/* 转单单号 */
|
||||
@TableField
|
||||
private String transferBillcode;
|
||||
/* 转单时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ -306,48 +355,64 @@ public class EmisWaybill extends BaseEntity
|
||||
/* 生成账单人代码 */
|
||||
private String produceBillManCode;
|
||||
/* 目的地编号 */
|
||||
@TableField
|
||||
private String destinationCode;
|
||||
/* 目的省 */
|
||||
private String destinationProvince;
|
||||
/* 目的城市 */
|
||||
@TableField
|
||||
private String destinationCity;
|
||||
/* 目的国家 */
|
||||
private String destinationCounty;
|
||||
/* 目的地网点代码 */
|
||||
@TableField
|
||||
private String dispatchUnderlingSiteCode;
|
||||
/* 目的地财务中心代码 */
|
||||
private String destinationCenterCode;
|
||||
/* 业务人代码 */
|
||||
private String marketManCode;
|
||||
/* 销售回款人 */
|
||||
@TableField
|
||||
private String payee;
|
||||
/* 销售联系人 */
|
||||
@TableField
|
||||
private String salesmen;
|
||||
/* 操作员代码 */
|
||||
@TableField
|
||||
private String operateEmployeeCode;
|
||||
/* 是否问题件 1-是 0-否 */
|
||||
@TableField
|
||||
private String blIsQuestion;
|
||||
/* 问题件类型 */
|
||||
@TableField
|
||||
private Integer problemType;
|
||||
/* 问题件原因 */
|
||||
@TableField
|
||||
private String problemCause;
|
||||
/* 问题件延期天数 */
|
||||
private Integer problemDelayDays;
|
||||
/* 是否给寄件人发短信 */
|
||||
@TableField
|
||||
private String blMessage;
|
||||
/* 是否给收件人发短信 */
|
||||
@TableField
|
||||
private String blAcceptMessage;
|
||||
/* 是否生成子单 1-是 0-否 */
|
||||
private String blGenSubbill;
|
||||
/* 签收状态 字典 */
|
||||
@TableField
|
||||
private String blSign;
|
||||
/* 签收人(客户) */
|
||||
@TableField
|
||||
private String signMan;
|
||||
/* 签收员代码 */
|
||||
@TableField
|
||||
private String signManCode;
|
||||
/* 签收站点代码 */
|
||||
@TableField
|
||||
private String signSiteCode;
|
||||
/* sign_date */
|
||||
@TableField
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date signDate;
|
||||
|
||||
|
||||
@ -651,11 +651,11 @@
|
||||
|
||||
|
||||
<if test="blSign != null and blSign == 1">
|
||||
and bl_sign='1'
|
||||
and a.bl_sign='1'
|
||||
</if>
|
||||
|
||||
<if test="blSign != null and blSign == 0">
|
||||
and bl_sign!='1'
|
||||
<if test="blSign != null and blSign!='' and blSign == 0">
|
||||
and a.bl_sign!='1'
|
||||
</if>
|
||||
|
||||
<if test="params.beginDate != null and params.beginDate != ''">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user