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