This commit is contained in:
linfso 2024-09-22 12:19:59 +08:00
parent 2009f68973
commit a7197447ce

View File

@ -75,33 +75,41 @@ public class EmisWaybill extends BaseEntity
private String openId;
/* 收货人名 */
@TableField
@DataAuditField(fieldComment = "收货人")
private String receiveName;
/* 收货公司 */
@TableField
@DataAuditField(fieldComment = "收件公司")
private String receiveCompany;
/* 收货人手机号 */
@TableField
@DataAuditField(fieldComment = "收件电话")
private String receiveMobile;
/* 收货人电话 */
@TableField
private String receiveTel;
/* 收货人国家 */
@TableField
@DataAuditField(fieldComment = "收件国家")
private String receiveCountry;
/* 省 */
@TableField
@DataAuditField(fieldComment = "收件省")
private String receiveProvince;
/* 市 */
@TableField
@DataAuditField(fieldComment = "收件市")
private String receiveCity;
/* 区 */
@TableField
@DataAuditField(fieldComment = "收件区")
private String receiveCounty;
/* 县 */
@TableField
private String receiveTown;
/* 收货地址 */
@TableField
@DataAuditField(fieldComment = "收件地址")
private String receiveAddress;
/* 邮编 */
private String receivePostcode;
@ -109,32 +117,40 @@ public class EmisWaybill extends BaseEntity
private String receivePcd;
/* 寄件人名 */
@TableField
@DataAuditField(fieldComment = "寄件人")
private String sendName;
/* 寄件公司 */
@TableField
@DataAuditField(fieldComment = "寄件公司")
private String sendCompany;
/* 寄件人手机号 */
@TableField
@DataAuditField(fieldComment = "寄件电话")
private String sendMobile;
/* 寄件人电话 */
@TableField
private String sendTel;
/* 寄件人国家 */
@TableField
@DataAuditField(fieldComment = "寄件国家")
private String sendCountry;
/* 寄件省 */
@TableField
@DataAuditField(fieldComment = "寄件省")
private String sendProvince;
/* 寄件市 */
@TableField
@DataAuditField(fieldComment = "寄件市")
private String sendCity;
/* 寄件区 */
@TableField
@DataAuditField(fieldComment = "寄件区")
private String sendCounty;
/* 寄件县 */
private String sendTown;
/* 寄件地址 */
@TableField
@DataAuditField(fieldComment = "寄件地址")
private String sendAddress;
/* 寄件邮编 */
private String sendPostcode;
@ -142,21 +158,27 @@ public class EmisWaybill extends BaseEntity
private String sendPcd;
/* 支付方式 : 现金或月结 */
@TableField
@DataAuditField(fieldComment = "支付方式")
private String paymentType;
/* 计费方式 1-按重量 2-按体积 3-一口价 */
@TableField
@DataAuditField(fieldComment = "计费方式")
private String calcFeeType;
/* 支付月结编号 */
@TableField
@DataAuditField(fieldComment = "月结客户编号")
private String custNo;
/* 月结客户的名称 */
@TableField
@DataAuditField(fieldComment = "月结客户名称")
private String custName;
/* 快递线路 */
@TableField
@DataAuditField(fieldComment = "线路")
private String transLineType;
/* 快递产品类型 */
@TableField
@DataAuditField(fieldComment = "产品类型")
private String productType;
/* 时效 */
private String timeType;
@ -166,22 +188,28 @@ public class EmisWaybill extends BaseEntity
private String carryType;
/* 清关方式 */
@TableField
@DataAuditField(fieldComment = "清关方式")
private String customsClear;
/* 报关方式 */
@TableField
@DataAuditField(fieldComment = "报关方式")
private String customsEclaration;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField
@DataAuditField(fieldComment = "预计到达时间")
private Date estimateDate;
/* 包装类型 */
@TableField
@DataAuditField(fieldComment = "包装类型")
private String packType;
/* 派件方式:1-派送 2-自提 */
@TableField
@DataAuditField(fieldComment = "派件方式")
private String dispatchMethod;
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
@TableField
@DataAuditField(fieldComment = "取件方式")
private String pickupMethod;
/* 预计上门取件开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@ -215,6 +243,7 @@ public class EmisWaybill extends BaseEntity
private String goodsType;
/* 货物描述 */
@TableField
@DataAuditField(fieldComment = "货物描述")
private String goodsInfo;
/* 货物图片,逗号隔开 */
private String goodsPics;
@ -236,9 +265,11 @@ public class EmisWaybill extends BaseEntity
private BigDecimal totalWeight;
/* 总体积 */
@TableField
@DataAuditField(fieldComment = "体积")
private BigDecimal totalVolume;
/* 件数 */
@TableField
@DataAuditField(fieldComment = "件数")
private Integer parcelQty;
/* 实际重量 */
@TableField
@ -252,6 +283,7 @@ public class EmisWaybill extends BaseEntity
private String currency;
/* 结算重量 */
@TableField
@DataAuditField(fieldComment = "结算重量")
private BigDecimal settlementWeight;
/* 扫描重量 */
private BigDecimal scanWeight;
@ -259,13 +291,16 @@ public class EmisWaybill extends BaseEntity
private BigDecimal feeWeight;
/* 运费 */
@TableField
@DataAuditField(fieldComment = "运费")
private BigDecimal freight;
/* 实际支付方式 : 现金或月结 */
private String realPaymentType;
/* 实收运费 */
/* 标准报价 */
@DataAuditField(fieldComment = "标准报价")
private BigDecimal realFee;
/* 是否特殊报价 */
@TableField
@DataAuditField(fieldComment = "是否特殊报价")
private String blSpecialQuote;
/* 是否超长 */
private String blOverLong;
@ -312,15 +347,19 @@ public class EmisWaybill extends BaseEntity
private Integer printCount;
/* 是否同行转单 */
@TableField
@DataAuditField(fieldComment = "是否转件")
private String blDispFd;
/* 转单快递代码 */
@TableField
@DataAuditField(fieldComment = "转件公司")
private String transferCode;
/* 转单单号 */
@TableField
@DataAuditField(fieldComment = "转件单号")
private String transferBillcode;
/* 转单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
/* 转件时间 */
@DataAuditField(fieldComment = "转件时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date dispFdDate;
/* 转单原因 */
private String dispFdReason;
@ -361,6 +400,7 @@ public class EmisWaybill extends BaseEntity
private String produceBillManCode;
/* 目的地编号 */
@TableField
@DataAuditField(fieldComment = "目的地编号")
private String destinationCode;
/* 目的省 */
private String destinationProvince;
@ -371,6 +411,7 @@ public class EmisWaybill extends BaseEntity
private String destinationCounty;
/* 目的地网点代码 */
@TableField
@DataAuditField(fieldComment = "目的地网点代码")
private String dispatchUnderlingSiteCode;
/* 目的地财务中心代码 */
private String destinationCenterCode;
@ -378,47 +419,61 @@ public class EmisWaybill extends BaseEntity
private String marketManCode;
/* 销售回款人 */
@TableField
@DataAuditField(fieldComment = "回款人联系人")
private String payee;
/* 销售联系人 */
@TableField
@DataAuditField(fieldComment = "销售联系人")
private String salesmen;
/* 操作员代码 */
@TableField
@DataAuditField(fieldComment = "操作员")
private String operateEmployeeCode;
/* 是否问题件 1-是 0-否 */
@TableField
@DataAuditField(fieldComment = "是否问题件")
private String blIsQuestion;
/* 问题件类型 */
@TableField
@DataAuditField(fieldComment = "问题件类型")
private Integer problemType;
/* 问题件原因 */
@TableField
@DataAuditField(fieldComment = "问题件原因")
private String problemCause;
/* 问题件延期天数 */
private Integer problemDelayDays;
/* 是否给寄件人发短信 */
@TableField
@DataAuditField(fieldComment = "是否寄件短信")
private String blMessage;
/* 是否给收件人发短信 */
@TableField
@DataAuditField(fieldComment = "是否收件短信")
private String blAcceptMessage;
/* 是否生成子单 1-是 0-否 */
@DataAuditField(fieldComment = "是否生成子单")
private String blGenSubbill;
/* 签收状态 字典 */
@TableField
@DataAuditField(fieldComment = "签收状态")
private String blSign;
/* 签收人(客户) */
@TableField
@DataAuditField(fieldComment = "签收人")
private String signMan;
/* 签收员代码 */
@TableField
@DataAuditField(fieldComment = "签收操作员")
private String signManCode;
/* 签收站点代码 */
@TableField
@DataAuditField(fieldComment = "签收网点")
private String signSiteCode;
/* sign_date */
@TableField
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@DataAuditField(fieldComment = "签收时间")
private Date signDate;
/* 时区偏差 */
@ -431,17 +486,19 @@ public class EmisWaybill extends BaseEntity
/* 付款备注 */
private String paymentRemark;
/* 订单备注 */
@DataAuditField(fieldComment = "订单备注")
private String orderRemark;
/* 数据来源 */
private String dataFrom;
/* 是否敏感物 */
@DataAuditField(fieldComment = "是否敏感物")
private String blSpecialGoods;
/* ext_info */
@DataAuditField(fieldComment = "扩展信息")
private String extInfo;
@TableField(exist = false)
private List<EmisWaybillCargo> cargoList;
@TableField(exist = false)