demand: tms-运单管理-根据单号/订单号查询订单详情接口查询返回客户类型，区分普通客户、月结客户
committer: heyu
This commit is contained in:
parent
26b6abe7fb
commit
e1d20377ee
@ -28,7 +28,6 @@ import java.util.List;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ClassName EmisWaybill
|
* @ClassName EmisWaybill
|
||||||
* @Description 运单列表
|
* @Description 运单列表
|
||||||
@ -37,13 +36,12 @@ import lombok.Data;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@TableName("emis_waybill")
|
@TableName("emis_waybill")
|
||||||
@DataAuditTable(tableName = "emis_waybill",tableComment = "运单表")
|
@DataAuditTable(tableName = "emis_waybill", tableComment = "运单表")
|
||||||
public class EmisWaybill extends BaseEntity
|
public class EmisWaybill extends BaseEntity {
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/* id */
|
/* id */
|
||||||
@TableId(value = "id",type = IdType.AUTO)
|
@TableId(value = "id", type = IdType.AUTO)
|
||||||
private Long id;
|
private Long id;
|
||||||
/* 订单号 */
|
/* 订单号 */
|
||||||
@TableField
|
@TableField
|
||||||
@ -54,7 +52,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
private String billCode;
|
private String billCode;
|
||||||
/* 子单号,逗号隔开 */
|
/* 子单号,逗号隔开 */
|
||||||
private String billCodeSub;
|
private String billCodeSub;
|
||||||
/* 订单状态 字典 */
|
/* 订单状态 字典 */
|
||||||
private String orderStatus;
|
private String orderStatus;
|
||||||
/* 组批次状态 */
|
/* 组批次状态 */
|
||||||
private String siteBatchStatus;
|
private String siteBatchStatus;
|
||||||
@ -63,12 +61,14 @@ public class EmisWaybill extends BaseEntity
|
|||||||
/* 订单类型 0-预报订单 1-正式订单 */
|
/* 订单类型 0-预报订单 1-正式订单 */
|
||||||
private String orderType;
|
private String orderType;
|
||||||
/* 下单时间 - 取客户当地时间 */
|
/* 下单时间 - 取客户当地时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date orderDate;
|
private Date orderDate;
|
||||||
/* 客户ID */
|
/* 客户ID */
|
||||||
private Long userId;
|
private Long userId;
|
||||||
/* 客户编号2502021 */
|
/* 客户编号2502021 */
|
||||||
private String customerCode;
|
private String customerCode;
|
||||||
|
/* 客户类型 1-普通客户 2-月结客户 */
|
||||||
|
private String customerType;
|
||||||
/* 客户客户名称 */
|
/* 客户客户名称 */
|
||||||
private String customerName;
|
private String customerName;
|
||||||
/* wx openid */
|
/* wx openid */
|
||||||
@ -164,11 +164,11 @@ public class EmisWaybill extends BaseEntity
|
|||||||
private Integer sendCustomerAddressId;
|
private Integer sendCustomerAddressId;
|
||||||
/* 支付方式 : 现金或月结 */
|
/* 支付方式 : 现金或月结 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "支付方式",dictType="emis_payment_type")
|
@DataAuditField(fieldComment = "支付方式", dictType = "emis_payment_type")
|
||||||
private String paymentType;
|
private String paymentType;
|
||||||
/* 计费方式 1-按重量 2-按体积 3-一口价 */
|
/* 计费方式 1-按重量 2-按体积 3-一口价 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "计费方式",dictType="emis_calc_fee_type")
|
@DataAuditField(fieldComment = "计费方式", dictType = "emis_calc_fee_type")
|
||||||
private String calcFeeType;
|
private String calcFeeType;
|
||||||
/* 支付月结编号 */
|
/* 支付月结编号 */
|
||||||
@TableField
|
@TableField
|
||||||
@ -195,35 +195,35 @@ public class EmisWaybill extends BaseEntity
|
|||||||
private String carryType;
|
private String carryType;
|
||||||
/* 清关方式 */
|
/* 清关方式 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "清关方式",dictType="emis_customs_clear")
|
@DataAuditField(fieldComment = "清关方式", dictType = "emis_customs_clear")
|
||||||
private String customsClear;
|
private String customsClear;
|
||||||
/* 报关方式 */
|
/* 报关方式 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "报关方式",dictType="emis_declare_mode")
|
@DataAuditField(fieldComment = "报关方式", dictType = "emis_declare_mode")
|
||||||
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 = "预计到达时间")
|
@DataAuditField(fieldComment = "预计到达时间")
|
||||||
private Date estimateDate;
|
private Date estimateDate;
|
||||||
/* 包装类型 */
|
/* 包装类型 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "包装类型",dictType="emis_tab_packing_type")
|
@DataAuditField(fieldComment = "包装类型", dictType = "emis_tab_packing_type")
|
||||||
private String packType;
|
private String packType;
|
||||||
/* 派件方式:1-派送 2-自提 */
|
/* 派件方式:1-派送 2-自提 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
|
@DataAuditField(fieldComment = "派件方式", dictType = "emis_dispatch_method")
|
||||||
private String dispatchMethod;
|
private String dispatchMethod;
|
||||||
/* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
|
/* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
|
@DataAuditField(fieldComment = "取件方式", dictType = "emis_qujian_fangshi")
|
||||||
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")
|
||||||
@TableField
|
@TableField
|
||||||
private Date pickStartDate;
|
private Date pickStartDate;
|
||||||
/* 预计上门取件结束时间 */
|
/* 预计上门取件结束时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
@TableField
|
@TableField
|
||||||
private Date pickFinishDate;
|
private Date pickFinishDate;
|
||||||
/* 取货失败原因 */
|
/* 取货失败原因 */
|
||||||
@ -401,7 +401,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
private String transferBillcode;
|
private String transferBillcode;
|
||||||
/* 转件时间 */
|
/* 转件时间 */
|
||||||
@DataAuditField(fieldComment = "转件时间")
|
@DataAuditField(fieldComment = "转件时间")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date dispFdDate;
|
private Date dispFdDate;
|
||||||
/* 转单原因 */
|
/* 转单原因 */
|
||||||
private String dispFdReason;
|
private String dispFdReason;
|
||||||
@ -414,7 +414,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
/* 登记站点代码 */
|
/* 登记站点代码 */
|
||||||
private String registerSiteCode;
|
private String registerSiteCode;
|
||||||
/* 登记时间 */
|
/* 登记时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date registerDate;
|
private Date registerDate;
|
||||||
/* 登记人编号 */
|
/* 登记人编号 */
|
||||||
private String registerManCode;
|
private String registerManCode;
|
||||||
@ -429,7 +429,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
/* 发件财务中心代码 */
|
/* 发件财务中心代码 */
|
||||||
private String sendCenterCode;
|
private String sendCenterCode;
|
||||||
/* 发货时间 - 取本地时间 */
|
/* 发货时间 - 取本地时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date sendDate;
|
private Date sendDate;
|
||||||
/* 派件人代码 */
|
/* 派件人代码 */
|
||||||
private String dispatchManCode;
|
private String dispatchManCode;
|
||||||
@ -438,7 +438,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
/* 派件网点代码 */
|
/* 派件网点代码 */
|
||||||
private String dispatchSiteCode;
|
private String dispatchSiteCode;
|
||||||
/* 生成账单时间 */
|
/* 生成账单时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date produceBillDate;
|
private Date produceBillDate;
|
||||||
/* 生成账单站点代码 */
|
/* 生成账单站点代码 */
|
||||||
private String produceBillSiteCode;
|
private String produceBillSiteCode;
|
||||||
@ -518,7 +518,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
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 = "签收时间")
|
@DataAuditField(fieldComment = "签收时间")
|
||||||
private Date signDate;
|
private Date signDate;
|
||||||
|
|
||||||
@ -527,7 +527,7 @@ public class EmisWaybill extends BaseEntity
|
|||||||
/* 付款状态 字典:emis_payment_status */
|
/* 付款状态 字典:emis_payment_status */
|
||||||
private String paymentStatus;
|
private String paymentStatus;
|
||||||
/* 付款时间 */
|
/* 付款时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date paymentDate;
|
private Date paymentDate;
|
||||||
/* 付款备注 */
|
/* 付款备注 */
|
||||||
private String paymentRemark;
|
private String paymentRemark;
|
||||||
@ -704,15 +704,15 @@ public class EmisWaybill extends BaseEntity
|
|||||||
|
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "提单号（记录海运提单信息）")
|
@DataAuditField(fieldComment = "提单号（记录海运提单信息）")
|
||||||
private String ladingBillCode ;
|
private String ladingBillCode;
|
||||||
|
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "贵司编号（记录相关业务的贵司编号）")
|
@DataAuditField(fieldComment = "贵司编号（记录相关业务的贵司编号）")
|
||||||
private String companyCode ;
|
private String companyCode;
|
||||||
|
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "起运港")
|
@DataAuditField(fieldComment = "起运港")
|
||||||
private String departurePort ;
|
private String departurePort;
|
||||||
|
|
||||||
@TableField
|
@TableField
|
||||||
@DataAuditField(fieldComment = "目的港")
|
@DataAuditField(fieldComment = "目的港")
|
||||||
|
|||||||
@ -14,7 +14,7 @@ import java.util.Date;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class WaybillOrder implements Serializable {
|
public class WaybillOrder implements Serializable {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private Long id;
|
private Long id;
|
||||||
@ -31,18 +31,16 @@ public class WaybillOrder implements Serializable {
|
|||||||
// 货物清单
|
// 货物清单
|
||||||
private List<Cargo> cargoList;
|
private List<Cargo> cargoList;
|
||||||
|
|
||||||
|
|
||||||
// 附件清单
|
// 附件清单
|
||||||
private List<Attachment> attachmentList;
|
private List<Attachment> attachmentList;
|
||||||
|
|
||||||
private List<DeclareGoods> declareGoodsList;
|
private List<DeclareGoods> declareGoodsList;
|
||||||
private List<DeclareAttachment> declareAttachmentList;
|
private List<DeclareAttachment> declareAttachmentList;
|
||||||
|
|
||||||
|
|
||||||
/* 客户单号，合同号 */
|
/* 客户单号，合同号 */
|
||||||
private String custOrderId;
|
private String custOrderId;
|
||||||
|
|
||||||
/* 订单状态 字典 */
|
/* 订单状态 字典 */
|
||||||
private String orderStatus;
|
private String orderStatus;
|
||||||
/* 运单状态 字典 */
|
/* 运单状态 字典 */
|
||||||
private String waybillStatus;
|
private String waybillStatus;
|
||||||
@ -58,7 +56,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
private String billCodeSub;
|
private String billCodeSub;
|
||||||
|
|
||||||
/* 下单时间 - 取客户当地时间 */
|
/* 下单时间 - 取客户当地时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date orderDate;
|
private Date orderDate;
|
||||||
|
|
||||||
/* 客户ID */
|
/* 客户ID */
|
||||||
@ -70,6 +68,9 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 寄件客户编号2502021 */
|
/* 寄件客户编号2502021 */
|
||||||
private String customerCode;
|
private String customerCode;
|
||||||
|
|
||||||
|
/* 客户类型 1-普通客户 2-月结客户 */
|
||||||
|
private String customerType;
|
||||||
|
|
||||||
/* 支付方式 : 现金或月结 */
|
/* 支付方式 : 现金或月结 */
|
||||||
private String paymentType;
|
private String paymentType;
|
||||||
|
|
||||||
@ -101,7 +102,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
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")
|
||||||
private Date estimateDate;
|
private Date estimateDate;
|
||||||
|
|
||||||
/* 包装类型 */
|
/* 包装类型 */
|
||||||
@ -114,10 +115,10 @@ public class WaybillOrder implements Serializable {
|
|||||||
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")
|
||||||
private Date pickStartDate;
|
private Date pickStartDate;
|
||||||
/* 预计上门取件结束时间 */
|
/* 预计上门取件结束时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date pickFinishDate;
|
private Date pickFinishDate;
|
||||||
|
|
||||||
/* 入仓代码 */
|
/* 入仓代码 */
|
||||||
@ -193,7 +194,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 转单单号 */
|
/* 转单单号 */
|
||||||
private String transferBillcode;
|
private String transferBillcode;
|
||||||
/* 转单时间 */
|
/* 转单时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date dispFdDate;
|
private Date dispFdDate;
|
||||||
|
|
||||||
/* 转单原因 */
|
/* 转单原因 */
|
||||||
@ -205,7 +206,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 登记站点代码 */
|
/* 登记站点代码 */
|
||||||
private String registerSiteCode;
|
private String registerSiteCode;
|
||||||
/* 登记时间 */
|
/* 登记时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date registerDate;
|
private Date registerDate;
|
||||||
/* 登记人编号 */
|
/* 登记人编号 */
|
||||||
private String registerManCode;
|
private String registerManCode;
|
||||||
@ -223,10 +224,10 @@ public class WaybillOrder implements Serializable {
|
|||||||
private String dispatchSiteCode;
|
private String dispatchSiteCode;
|
||||||
|
|
||||||
/* 派件时间 */
|
/* 派件时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date dispatchDate;
|
private Date dispatchDate;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date sendDate;
|
private Date sendDate;
|
||||||
|
|
||||||
/* 目的地编号 */
|
/* 目的地编号 */
|
||||||
@ -294,7 +295,6 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 是否敏感物 */
|
/* 是否敏感物 */
|
||||||
private String blSpecialGoods;
|
private String blSpecialGoods;
|
||||||
|
|
||||||
|
|
||||||
/* ext_info */
|
/* ext_info */
|
||||||
private String extInfo;
|
private String extInfo;
|
||||||
|
|
||||||
@ -302,13 +302,13 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 是否生成子单 1-是 0-否 */
|
/* 是否生成子单 1-是 0-否 */
|
||||||
private String blGenSubbill;
|
private String blGenSubbill;
|
||||||
|
|
||||||
// private String receiveCountryName;
|
// private String receiveCountryName;
|
||||||
// private String receiveProvinceName;
|
// private String receiveProvinceName;
|
||||||
// private String receiveCityName;
|
// private String receiveCityName;
|
||||||
//
|
//
|
||||||
// private String sendCountryName;
|
// private String sendCountryName;
|
||||||
// private String sendProvinceName;
|
// private String sendProvinceName;
|
||||||
// private String sendCityName;
|
// private String sendCityName;
|
||||||
|
|
||||||
private String transLineTypeName;
|
private String transLineTypeName;
|
||||||
private String productTypeName;
|
private String productTypeName;
|
||||||
@ -345,7 +345,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
/* 签收站点代码 */
|
/* 签收站点代码 */
|
||||||
private String signSiteCode;
|
private String signSiteCode;
|
||||||
/* 签收时间 */
|
/* 签收时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date signDate;
|
private Date signDate;
|
||||||
|
|
||||||
/* 当前网点编号 */
|
/* 当前网点编号 */
|
||||||
@ -359,26 +359,24 @@ public class WaybillOrder implements Serializable {
|
|||||||
private String lockFlag;
|
private String lockFlag;
|
||||||
private String lockReason;
|
private String lockReason;
|
||||||
|
|
||||||
|
|
||||||
/* 是否问题件 1-是 0-否 */
|
/* 是否问题件 1-是 0-否 */
|
||||||
private String blIsQuestion;
|
private String blIsQuestion;
|
||||||
/* 问题件原因 */
|
/* 问题件原因 */
|
||||||
private String problemCause;
|
private String problemCause;
|
||||||
private String problemTypeName;
|
private String problemTypeName;
|
||||||
|
|
||||||
|
|
||||||
private String registerSiteName;
|
private String registerSiteName;
|
||||||
/* 录单人 */
|
/* 录单人 */
|
||||||
private String registerManName;
|
private String registerManName;
|
||||||
|
|
||||||
/* 提单号（记录海运提单信息） */
|
/* 提单号（记录海运提单信息） */
|
||||||
private String ladingBillCode ;
|
private String ladingBillCode;
|
||||||
|
|
||||||
/* 贵司编号（记录相关业务的贵司编号） */
|
/* 贵司编号（记录相关业务的贵司编号） */
|
||||||
private String companyCode ;
|
private String companyCode;
|
||||||
|
|
||||||
/* 起运港 */
|
/* 起运港 */
|
||||||
private String departurePort ;
|
private String departurePort;
|
||||||
|
|
||||||
/* 目的港 */
|
/* 目的港 */
|
||||||
private String destinationPort;
|
private String destinationPort;
|
||||||
@ -401,30 +399,30 @@ public class WaybillOrder implements Serializable {
|
|||||||
private String virtualRemark;
|
private String virtualRemark;
|
||||||
|
|
||||||
// 销售,回款
|
// 销售,回款
|
||||||
// private String salesmenName;
|
// private String salesmenName;
|
||||||
// private String payeeName;
|
// private String payeeName;
|
||||||
|
|
||||||
// 客户名称(月结时候使用): customerName
|
|
||||||
// 线路名称: transLineTypeName
|
|
||||||
// 产品类型名称: productTypeName
|
|
||||||
// 操作员名称: operateEmployeeName
|
|
||||||
//
|
|
||||||
// 收件员名称 : takePieceEmployeeName
|
|
||||||
//
|
|
||||||
// 派件员名称 : dispatchManName
|
|
||||||
// 派件网点名称 : dispatchSiteName
|
|
||||||
//
|
|
||||||
// 月结账户名称 : customerName
|
|
||||||
// 销售联系人名称:salesmen
|
|
||||||
// 回款联系人名称: payee
|
|
||||||
//
|
|
||||||
// 发件网点名称:sendSiteName
|
|
||||||
// 目的地名称:destinationName
|
|
||||||
// 目的网点名称:dispatchUnderlingSiteName
|
|
||||||
|
|
||||||
|
// 客户名称(月结时候使用): customerName
|
||||||
|
// 线路名称: transLineTypeName
|
||||||
|
// 产品类型名称: productTypeName
|
||||||
|
// 操作员名称: operateEmployeeName
|
||||||
|
//
|
||||||
|
// 收件员名称 : takePieceEmployeeName
|
||||||
|
//
|
||||||
|
// 派件员名称 : dispatchManName
|
||||||
|
// 派件网点名称 : dispatchSiteName
|
||||||
|
//
|
||||||
|
// 月结账户名称 : customerName
|
||||||
|
// 销售联系人名称:salesmen
|
||||||
|
// 回款联系人名称: payee
|
||||||
|
//
|
||||||
|
// 发件网点名称:sendSiteName
|
||||||
|
// 目的地名称:destinationName
|
||||||
|
// 目的网点名称:dispatchUnderlingSiteName
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转 VO
|
* 转 VO
|
||||||
|
*
|
||||||
* @param dbWaybill
|
* @param dbWaybill
|
||||||
* @param dbCargoList
|
* @param dbCargoList
|
||||||
* @param dbFeeitemList
|
* @param dbFeeitemList
|
||||||
@ -432,12 +430,11 @@ public class WaybillOrder implements Serializable {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static WaybillOrder toVo(EmisWaybill dbWaybill,
|
public static WaybillOrder toVo(EmisWaybill dbWaybill,
|
||||||
List<EmisWaybillCargo> dbCargoList,
|
List<EmisWaybillCargo> dbCargoList,
|
||||||
List<EmisWaybillFeeitem> dbFeeitemList,
|
List<EmisWaybillFeeitem> dbFeeitemList,
|
||||||
List<EmisWaybillAttachment> dbAttachmentList,
|
List<EmisWaybillAttachment> dbAttachmentList,
|
||||||
List<EmisWaybillDeclareGoods> dbDecareGoodsList,
|
List<EmisWaybillDeclareGoods> dbDecareGoodsList,
|
||||||
List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList
|
List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList) {
|
||||||
){
|
|
||||||
|
|
||||||
WaybillOrder voItem = new WaybillOrder();
|
WaybillOrder voItem = new WaybillOrder();
|
||||||
|
|
||||||
@ -445,7 +442,6 @@ public class WaybillOrder implements Serializable {
|
|||||||
FeeItem feeItemCvt = new FeeItem();
|
FeeItem feeItemCvt = new FeeItem();
|
||||||
Attachment attachmentCvt = new Attachment();
|
Attachment attachmentCvt = new Attachment();
|
||||||
|
|
||||||
|
|
||||||
DeclareGoods declareGoodsCvt = new DeclareGoods();
|
DeclareGoods declareGoodsCvt = new DeclareGoods();
|
||||||
DeclareAttachment declareAttachmentCvt = new DeclareAttachment();
|
DeclareAttachment declareAttachmentCvt = new DeclareAttachment();
|
||||||
|
|
||||||
@ -507,7 +503,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
sender.setId(dbWaybill.getSendCustomerAddressId());
|
sender.setId(dbWaybill.getSendCustomerAddressId());
|
||||||
voItem.setSender(sender);
|
voItem.setSender(sender);
|
||||||
|
|
||||||
// voItem.setId(dbWaybill.getId());
|
// voItem.setId(dbWaybill.getId());
|
||||||
voItem.setOrderSn(dbWaybill.getOrderSn());
|
voItem.setOrderSn(dbWaybill.getOrderSn());
|
||||||
voItem.setCustOrderId(dbWaybill.getCustOrderId());
|
voItem.setCustOrderId(dbWaybill.getCustOrderId());
|
||||||
voItem.setBillCode(dbWaybill.getBillCode());
|
voItem.setBillCode(dbWaybill.getBillCode());
|
||||||
@ -515,12 +511,13 @@ public class WaybillOrder implements Serializable {
|
|||||||
|
|
||||||
voItem.setOrderStatus(dbWaybill.getOrderStatus());
|
voItem.setOrderStatus(dbWaybill.getOrderStatus());
|
||||||
voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
|
voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
|
||||||
// voItem.setOrderType(dbWaybill.getOrderType());
|
// voItem.setOrderType(dbWaybill.getOrderType());
|
||||||
|
|
||||||
voItem.setOrderDate(dbWaybill.getOrderDate());
|
voItem.setOrderDate(dbWaybill.getOrderDate());
|
||||||
voItem.setUserId(dbWaybill.getUserId());
|
voItem.setUserId(dbWaybill.getUserId());
|
||||||
voItem.setCustomerCode(dbWaybill.getCustomerCode());
|
voItem.setCustomerCode(dbWaybill.getCustomerCode());
|
||||||
voItem.setCustomerName(dbWaybill.getCustomerName());
|
voItem.setCustomerName(dbWaybill.getCustomerName());
|
||||||
|
voItem.setCustomerType(dbWaybill.getCustomerType());
|
||||||
voItem.setSendSiteName(dbWaybill.getSendSiteName());
|
voItem.setSendSiteName(dbWaybill.getSendSiteName());
|
||||||
voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
|
voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
|
||||||
voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
|
voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
|
||||||
@ -535,7 +532,6 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setMasterBillCode(dbWaybill.getMasterBillCode());
|
voItem.setMasterBillCode(dbWaybill.getMasterBillCode());
|
||||||
voItem.setVirtualRemark(dbWaybill.getVirtualRemark());
|
voItem.setVirtualRemark(dbWaybill.getVirtualRemark());
|
||||||
|
|
||||||
|
|
||||||
voItem.setOpenId(dbWaybill.getOpenId());
|
voItem.setOpenId(dbWaybill.getOpenId());
|
||||||
|
|
||||||
voItem.setPaymentType(dbWaybill.getPaymentType());
|
voItem.setPaymentType(dbWaybill.getPaymentType());
|
||||||
@ -566,7 +562,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setTransLineTypeName(dbWaybill.getTransLineTypeName());
|
voItem.setTransLineTypeName(dbWaybill.getTransLineTypeName());
|
||||||
voItem.setProductTypeName(dbWaybill.getProductTypeName());
|
voItem.setProductTypeName(dbWaybill.getProductTypeName());
|
||||||
|
|
||||||
// voItem.setPickFailReason(dbWaybill.getPickFailReason());
|
// voItem.setPickFailReason(dbWaybill.getPickFailReason());
|
||||||
|
|
||||||
voItem.setIntoWarehouseCode(dbWaybill.getIntoWarehouseCode());
|
voItem.setIntoWarehouseCode(dbWaybill.getIntoWarehouseCode());
|
||||||
voItem.setIntoWarehouseName(dbWaybill.getIntoWarehouseName());
|
voItem.setIntoWarehouseName(dbWaybill.getIntoWarehouseName());
|
||||||
@ -577,7 +573,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setWarehouseInNo(dbWaybill.getWarehouseInNo());
|
voItem.setWarehouseInNo(dbWaybill.getWarehouseInNo());
|
||||||
voItem.setCustomerDeliveryBeginTime(dbWaybill.getCustomerDeliveryBeginTime());
|
voItem.setCustomerDeliveryBeginTime(dbWaybill.getCustomerDeliveryBeginTime());
|
||||||
|
|
||||||
// voItem.setCustomerDeliveryEndTime(dbWaybill.getCustomerDeliveryEndTime());
|
// voItem.setCustomerDeliveryEndTime(dbWaybill.getCustomerDeliveryEndTime());
|
||||||
|
|
||||||
voItem.setGoodsType(dbWaybill.getGoodsType());
|
voItem.setGoodsType(dbWaybill.getGoodsType());
|
||||||
voItem.setGoodsInfo(dbWaybill.getGoodsInfo());
|
voItem.setGoodsInfo(dbWaybill.getGoodsInfo());
|
||||||
@ -600,8 +596,8 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setFreight(dbWaybill.getFreight());
|
voItem.setFreight(dbWaybill.getFreight());
|
||||||
voItem.setBlOverLong(dbWaybill.getBlOverLong());
|
voItem.setBlOverLong(dbWaybill.getBlOverLong());
|
||||||
|
|
||||||
// voItem.setBlBill(dbWaybill.getBlBill());
|
// voItem.setBlBill(dbWaybill.getBlBill());
|
||||||
// voItem.setBlBillText(dbWaybill.getBlBillText());
|
// voItem.setBlBillText(dbWaybill.getBlBillText());
|
||||||
|
|
||||||
voItem.setBlOverWeight(dbWaybill.getBlOverWeight());
|
voItem.setBlOverWeight(dbWaybill.getBlOverWeight());
|
||||||
voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber());
|
voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber());
|
||||||
@ -612,30 +608,30 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote());
|
voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote());
|
||||||
voItem.setBlSpecialGoods(dbWaybill.getBlSpecialGoods());
|
voItem.setBlSpecialGoods(dbWaybill.getBlSpecialGoods());
|
||||||
|
|
||||||
// voItem.setThirdCode(dbWaybill.getThirdCode());
|
// voItem.setThirdCode(dbWaybill.getThirdCode());
|
||||||
|
|
||||||
voItem.setRealValue(dbWaybill.getRealValue());
|
voItem.setRealValue(dbWaybill.getRealValue());
|
||||||
|
|
||||||
voItem.setExtInfo(dbWaybill.getExtInfo());
|
voItem.setExtInfo(dbWaybill.getExtInfo());
|
||||||
// voItem.setBlInsure(dbWaybill.getBlInsure());
|
// voItem.setBlInsure(dbWaybill.getBlInsure());
|
||||||
// voItem.setInsureValue(dbWaybill.getInsureValue());
|
// voItem.setInsureValue(dbWaybill.getInsureValue());
|
||||||
// voItem.setInsureValueCurrency(dbWaybill.getInsureValueCurrency());
|
// voItem.setInsureValueCurrency(dbWaybill.getInsureValueCurrency());
|
||||||
// voItem.setInsureFeeCurrency(dbWaybill.getInsureFeeCurrency());
|
// voItem.setInsureFeeCurrency(dbWaybill.getInsureFeeCurrency());
|
||||||
// voItem.setInsureFee(dbWaybill.getInsureFee());
|
// voItem.setInsureFee(dbWaybill.getInsureFee());
|
||||||
// voItem.setInsureRemark(dbWaybill.getInsureRemark());
|
// voItem.setInsureRemark(dbWaybill.getInsureRemark());
|
||||||
// voItem.setInsureSiteCode(dbWaybill.getInsureSiteCode());
|
// voItem.setInsureSiteCode(dbWaybill.getInsureSiteCode());
|
||||||
// voItem.setInsureDate(dbWaybill.getInsureDate());
|
// voItem.setInsureDate(dbWaybill.getInsureDate());
|
||||||
// voItem.setBlPrint(dbWaybill.getBlPrint());
|
// voItem.setBlPrint(dbWaybill.getBlPrint());
|
||||||
// voItem.setPrintManCode(dbWaybill.getPrintManCode());
|
// voItem.setPrintManCode(dbWaybill.getPrintManCode());
|
||||||
// voItem.setPrintSite(dbWaybill.getPrintSite());
|
// voItem.setPrintSite(dbWaybill.getPrintSite());
|
||||||
// voItem.setPrintDate(dbWaybill.getPrintDate());
|
// voItem.setPrintDate(dbWaybill.getPrintDate());
|
||||||
// voItem.setPrintCount(dbWaybill.getPrintCount());
|
// voItem.setPrintCount(dbWaybill.getPrintCount());
|
||||||
|
|
||||||
voItem.setBlDispFd(dbWaybill.getBlDispFd());
|
voItem.setBlDispFd(dbWaybill.getBlDispFd());
|
||||||
voItem.setTransferCode(dbWaybill.getTransferCode());
|
voItem.setTransferCode(dbWaybill.getTransferCode());
|
||||||
voItem.setTransferBillcode(dbWaybill.getTransferBillcode());
|
voItem.setTransferBillcode(dbWaybill.getTransferBillcode());
|
||||||
voItem.setDispFdDate(dbWaybill.getDispFdDate());
|
voItem.setDispFdDate(dbWaybill.getDispFdDate());
|
||||||
// voItem.setDispFdReason(dbWaybill.getDispFdReason());
|
// voItem.setDispFdReason(dbWaybill.getDispFdReason());
|
||||||
|
|
||||||
voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
|
voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
|
||||||
voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
|
voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
|
||||||
@ -657,9 +653,9 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
|
voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
|
||||||
voItem.setDispatchDate(dbWaybill.getDispatchDate());
|
voItem.setDispatchDate(dbWaybill.getDispatchDate());
|
||||||
voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
|
voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
|
||||||
// voItem.setProduceBillDate(dbWaybill.getProduceBillDate());
|
// voItem.setProduceBillDate(dbWaybill.getProduceBillDate());
|
||||||
// voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode());
|
// voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode());
|
||||||
// voItem.setProduceBillManCode(dbWaybill.getProduceBillManCode());
|
// voItem.setProduceBillManCode(dbWaybill.getProduceBillManCode());
|
||||||
|
|
||||||
voItem.setDestinationCode(dbWaybill.getDestinationCode());
|
voItem.setDestinationCode(dbWaybill.getDestinationCode());
|
||||||
voItem.setDestinationProvince(dbWaybill.getDestinationProvince());
|
voItem.setDestinationProvince(dbWaybill.getDestinationProvince());
|
||||||
@ -688,15 +684,15 @@ public class WaybillOrder implements Serializable {
|
|||||||
voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk());
|
voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk());
|
||||||
voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk());
|
voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk());
|
||||||
voItem.setBillPicGoodsRmk(dbWaybill.getBillPicGoodsRmk());
|
voItem.setBillPicGoodsRmk(dbWaybill.getBillPicGoodsRmk());
|
||||||
// voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset());
|
// voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset());
|
||||||
// voItem.setDelFlag(dbWaybill.getDelFlag());
|
// voItem.setDelFlag(dbWaybill.getDelFlag());
|
||||||
// voItem.setCreateBy(dbWaybill.getCreateBy());
|
// voItem.setCreateBy(dbWaybill.getCreateBy());
|
||||||
// voItem.setCreateTime(dbWaybill.getCreateTime());
|
// voItem.setCreateTime(dbWaybill.getCreateTime());
|
||||||
// voItem.setUpdateBy(dbWaybill.getUpdateBy());
|
// voItem.setUpdateBy(dbWaybill.getUpdateBy());
|
||||||
// voItem.setUpdateTime(dbWaybill.getUpdateTime());
|
// voItem.setUpdateTime(dbWaybill.getUpdateTime());
|
||||||
voItem.setRemark(dbWaybill.getRemark());
|
voItem.setRemark(dbWaybill.getRemark());
|
||||||
// voItem.setCreateSite(dbWaybill.getCreateSite());
|
// voItem.setCreateSite(dbWaybill.getCreateSite());
|
||||||
// voItem.setUpdateSite(dbWaybill.getUpdateSite());
|
// voItem.setUpdateSite(dbWaybill.getUpdateSite());
|
||||||
|
|
||||||
voItem.setLockFlag(dbWaybill.getLockFlag());
|
voItem.setLockFlag(dbWaybill.getLockFlag());
|
||||||
voItem.setLockReason(dbWaybill.getLockReason());
|
voItem.setLockReason(dbWaybill.getLockReason());
|
||||||
@ -714,12 +710,12 @@ public class WaybillOrder implements Serializable {
|
|||||||
return voItem;
|
return voItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转为数据库类型值
|
* 转为数据库类型值
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public EmisWaybill toDb(){
|
public EmisWaybill toDb() {
|
||||||
EmisWaybill dbWaybill = new EmisWaybill();
|
EmisWaybill dbWaybill = new EmisWaybill();
|
||||||
|
|
||||||
Cargo cargoCvt = new Cargo();
|
Cargo cargoCvt = new Cargo();
|
||||||
@ -743,9 +739,9 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setBillCode(this.getBillCode());
|
dbWaybill.setBillCode(this.getBillCode());
|
||||||
dbWaybill.setBillCodeSub(this.getBillCodeSub());
|
dbWaybill.setBillCodeSub(this.getBillCodeSub());
|
||||||
|
|
||||||
// dbWaybill.setOrderStatus(this.getOrderStatus());
|
// dbWaybill.setOrderStatus(this.getOrderStatus());
|
||||||
// dbWaybill.setWaybillStatus(this.getWaybillStatus());
|
// dbWaybill.setWaybillStatus(this.getWaybillStatus());
|
||||||
// dbWaybill.setOrderType(this.getOrderType());
|
// dbWaybill.setOrderType(this.getOrderType());
|
||||||
|
|
||||||
dbWaybill.setOrderDate(this.getOrderDate());
|
dbWaybill.setOrderDate(this.getOrderDate());
|
||||||
dbWaybill.setUserId(this.getUserId());
|
dbWaybill.setUserId(this.getUserId());
|
||||||
@ -756,15 +752,15 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setMasterBillCode(this.getMasterBillCode());
|
dbWaybill.setMasterBillCode(this.getMasterBillCode());
|
||||||
dbWaybill.setVirtualRemark(this.getVirtualRemark());
|
dbWaybill.setVirtualRemark(this.getVirtualRemark());
|
||||||
|
|
||||||
// dbWaybill.setCustomerName(this.getCustomerName());
|
// dbWaybill.setCustomerName(this.getCustomerName());
|
||||||
// dbWaybill.setReceiveCustomerCode(this.getReceiveCustomerCode());
|
// dbWaybill.setReceiveCustomerCode(this.getReceiveCustomerCode());
|
||||||
// dbWaybill.setReceiveCustomerName(this.getReceiveCustomerName());
|
// dbWaybill.setReceiveCustomerName(this.getReceiveCustomerName());
|
||||||
// dbWaybill.setThirdCustomerCode(this.getThirdCustomerCode());
|
// dbWaybill.setThirdCustomerCode(this.getThirdCustomerCode());
|
||||||
// dbWaybill.setThirdCustomerName(this.getThirdCustomerName());
|
// dbWaybill.setThirdCustomerName(this.getThirdCustomerName());
|
||||||
|
|
||||||
dbWaybill.setOpenId(this.getOpenId());
|
dbWaybill.setOpenId(this.getOpenId());
|
||||||
|
|
||||||
if(this.getReciever() != null){
|
if (this.getReciever() != null) {
|
||||||
Reciever reciever = this.getReciever();
|
Reciever reciever = this.getReciever();
|
||||||
dbWaybill.setReceiveName(reciever.getName());
|
dbWaybill.setReceiveName(reciever.getName());
|
||||||
dbWaybill.setReceiveMobile(reciever.getPhone());
|
dbWaybill.setReceiveMobile(reciever.getPhone());
|
||||||
@ -777,7 +773,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setReceiveCompany(reciever.getCompany());
|
dbWaybill.setReceiveCompany(reciever.getCompany());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.getSender() != null){
|
if (this.getSender() != null) {
|
||||||
Sender sender = this.getSender();
|
Sender sender = this.getSender();
|
||||||
dbWaybill.setSendName(sender.getName());
|
dbWaybill.setSendName(sender.getName());
|
||||||
dbWaybill.setSendMobile(sender.getPhone());
|
dbWaybill.setSendMobile(sender.getPhone());
|
||||||
@ -815,7 +811,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setPickStartDate(this.getPickStartDate());
|
dbWaybill.setPickStartDate(this.getPickStartDate());
|
||||||
dbWaybill.setPickFinishDate(this.getPickFinishDate());
|
dbWaybill.setPickFinishDate(this.getPickFinishDate());
|
||||||
|
|
||||||
// dbWaybill.setPickFailReason(this.getPickFailReason());
|
// dbWaybill.setPickFailReason(this.getPickFailReason());
|
||||||
|
|
||||||
dbWaybill.setIntoWarehouseCode(this.getIntoWarehouseCode());
|
dbWaybill.setIntoWarehouseCode(this.getIntoWarehouseCode());
|
||||||
dbWaybill.setIntoWarehouseName(this.getIntoWarehouseName());
|
dbWaybill.setIntoWarehouseName(this.getIntoWarehouseName());
|
||||||
@ -828,7 +824,7 @@ public class WaybillOrder implements Serializable {
|
|||||||
|
|
||||||
dbWaybill.setCustomerDeliveryBeginTime(this.getCustomerDeliveryBeginTime());
|
dbWaybill.setCustomerDeliveryBeginTime(this.getCustomerDeliveryBeginTime());
|
||||||
|
|
||||||
// dbWaybill.setCustomerDeliveryEndTime(this.getCustomerDeliveryEndTime());
|
// dbWaybill.setCustomerDeliveryEndTime(this.getCustomerDeliveryEndTime());
|
||||||
|
|
||||||
dbWaybill.setGoodsType(this.getGoodsType());
|
dbWaybill.setGoodsType(this.getGoodsType());
|
||||||
dbWaybill.setGoodsInfo(this.getGoodsInfo());
|
dbWaybill.setGoodsInfo(this.getGoodsInfo());
|
||||||
@ -852,8 +848,8 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setFreight(this.getFreight());
|
dbWaybill.setFreight(this.getFreight());
|
||||||
dbWaybill.setBlOverLong(this.getBlOverLong());
|
dbWaybill.setBlOverLong(this.getBlOverLong());
|
||||||
|
|
||||||
// dbWaybill.setBlBill(this.getBlBill());
|
// dbWaybill.setBlBill(this.getBlBill());
|
||||||
// dbWaybill.setBlBillText(this.getBlBillText());
|
// dbWaybill.setBlBillText(this.getBlBillText());
|
||||||
|
|
||||||
dbWaybill.setBlSpecialQuote(this.getBlSpecialQuote());
|
dbWaybill.setBlSpecialQuote(this.getBlSpecialQuote());
|
||||||
dbWaybill.setBlSpecialGoods(this.getBlSpecialGoods());
|
dbWaybill.setBlSpecialGoods(this.getBlSpecialGoods());
|
||||||
@ -866,32 +862,32 @@ public class WaybillOrder implements Serializable {
|
|||||||
// 代收描述
|
// 代收描述
|
||||||
dbWaybill.setCodFeeDesc(this.getCodFeeDesc());
|
dbWaybill.setCodFeeDesc(this.getCodFeeDesc());
|
||||||
|
|
||||||
// dbWaybill.setThirdCode(this.getThirdCode());
|
// dbWaybill.setThirdCode(this.getThirdCode());
|
||||||
dbWaybill.setRealValue(this.getRealValue());
|
dbWaybill.setRealValue(this.getRealValue());
|
||||||
// dbWaybill.setBlInsure(this.getBlInsure());
|
// dbWaybill.setBlInsure(this.getBlInsure());
|
||||||
// dbWaybill.setInsureValue(this.getInsureValue());
|
// dbWaybill.setInsureValue(this.getInsureValue());
|
||||||
// dbWaybill.setInsureValueCurrency(this.getInsureValueCurrency());
|
// dbWaybill.setInsureValueCurrency(this.getInsureValueCurrency());
|
||||||
// dbWaybill.setInsureFeeCurrency(this.getInsureFeeCurrency());
|
// dbWaybill.setInsureFeeCurrency(this.getInsureFeeCurrency());
|
||||||
// dbWaybill.setInsureFee(this.getInsureFee());
|
// dbWaybill.setInsureFee(this.getInsureFee());
|
||||||
// dbWaybill.setInsureRemark(this.getInsureRemark());
|
// dbWaybill.setInsureRemark(this.getInsureRemark());
|
||||||
// dbWaybill.setInsureSiteCode(this.getInsureSiteCode());
|
// dbWaybill.setInsureSiteCode(this.getInsureSiteCode());
|
||||||
// dbWaybill.setInsureDate(this.getInsureDate());
|
// dbWaybill.setInsureDate(this.getInsureDate());
|
||||||
// dbWaybill.setBlPrint(this.getBlPrint());
|
// dbWaybill.setBlPrint(this.getBlPrint());
|
||||||
// dbWaybill.setPrintManCode(this.getPrintManCode());
|
// dbWaybill.setPrintManCode(this.getPrintManCode());
|
||||||
// dbWaybill.setPrintSite(this.getPrintSite());
|
// dbWaybill.setPrintSite(this.getPrintSite());
|
||||||
// dbWaybill.setPrintDate(this.getPrintDate());
|
// dbWaybill.setPrintDate(this.getPrintDate());
|
||||||
// dbWaybill.setPrintCount(this.getPrintCount());
|
// dbWaybill.setPrintCount(this.getPrintCount());
|
||||||
// dbWaybill.setBlDispFd(this.getBlDispFd());
|
// dbWaybill.setBlDispFd(this.getBlDispFd());
|
||||||
// dbWaybill.setTransferCode(this.getTransferCode());
|
// dbWaybill.setTransferCode(this.getTransferCode());
|
||||||
// dbWaybill.setTransferBillcode(this.getTransferBillcode());
|
// dbWaybill.setTransferBillcode(this.getTransferBillcode());
|
||||||
// dbWaybill.setDispFdDate(this.getDispFdDate());
|
// dbWaybill.setDispFdDate(this.getDispFdDate());
|
||||||
// dbWaybill.setDispFdReason(this.getDispFdReason());
|
// dbWaybill.setDispFdReason(this.getDispFdReason());
|
||||||
// dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode());
|
// dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode());
|
||||||
// dbWaybill.setNextSiteCode(this.getNextSiteCode());
|
// dbWaybill.setNextSiteCode(this.getNextSiteCode());
|
||||||
// dbWaybill.setLastSiteCode(this.getLastSiteCode());
|
// dbWaybill.setLastSiteCode(this.getLastSiteCode());
|
||||||
dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode());
|
dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode());
|
||||||
// dbWaybill.setRegisterDate(this.getRegisterDate());
|
// dbWaybill.setRegisterDate(this.getRegisterDate());
|
||||||
// dbWaybill.setRegisterManCode(this.getRegisterManCode());
|
// dbWaybill.setRegisterManCode(this.getRegisterManCode());
|
||||||
dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode());
|
dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode());
|
||||||
dbWaybill.setSendSiteCode(this.getSendSiteCode());
|
dbWaybill.setSendSiteCode(this.getSendSiteCode());
|
||||||
dbWaybill.setStartSiteCode(this.getStartSiteCode());
|
dbWaybill.setStartSiteCode(this.getStartSiteCode());
|
||||||
@ -900,12 +896,12 @@ public class WaybillOrder implements Serializable {
|
|||||||
|
|
||||||
dbWaybill.setSendSiteName(this.getSendSiteName());
|
dbWaybill.setSendSiteName(this.getSendSiteName());
|
||||||
|
|
||||||
// dbWaybill.setDispatchManCode(this.getDispatchManCode());
|
// dbWaybill.setDispatchManCode(this.getDispatchManCode());
|
||||||
// dbWaybill.setDispatchDate(this.getDispatchDate());
|
// dbWaybill.setDispatchDate(this.getDispatchDate());
|
||||||
dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());
|
dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());
|
||||||
// dbWaybill.setProduceBillDate(this.getProduceBillDate());
|
// dbWaybill.setProduceBillDate(this.getProduceBillDate());
|
||||||
// dbWaybill.setProduceBillSiteCode(this.getProduceBillSiteCode());
|
// dbWaybill.setProduceBillSiteCode(this.getProduceBillSiteCode());
|
||||||
// dbWaybill.setProduceBillManCode(this.getProduceBillManCode());
|
// dbWaybill.setProduceBillManCode(this.getProduceBillManCode());
|
||||||
dbWaybill.setDestinationCode(this.getDestinationCode());
|
dbWaybill.setDestinationCode(this.getDestinationCode());
|
||||||
dbWaybill.setDestinationProvince(this.getDestinationProvince());
|
dbWaybill.setDestinationProvince(this.getDestinationProvince());
|
||||||
dbWaybill.setDestinationCity(this.getDestinationCity());
|
dbWaybill.setDestinationCity(this.getDestinationCity());
|
||||||
@ -916,26 +912,26 @@ public class WaybillOrder implements Serializable {
|
|||||||
dbWaybill.setPayee(this.getPayee());
|
dbWaybill.setPayee(this.getPayee());
|
||||||
dbWaybill.setSalesmen(this.getSalesmen());
|
dbWaybill.setSalesmen(this.getSalesmen());
|
||||||
dbWaybill.setOperateEmployeeCode(this.getOperateEmployeeCode());
|
dbWaybill.setOperateEmployeeCode(this.getOperateEmployeeCode());
|
||||||
// dbWaybill.setBlIsQuestion(this.getBlIsQuestion());
|
// dbWaybill.setBlIsQuestion(this.getBlIsQuestion());
|
||||||
// dbWaybill.setProblemCause(this.getProblemCause());
|
// dbWaybill.setProblemCause(this.getProblemCause());
|
||||||
dbWaybill.setBlMessage(this.getBlMessage());
|
dbWaybill.setBlMessage(this.getBlMessage());
|
||||||
dbWaybill.setBlAcceptMessage(this.getBlAcceptMessage());
|
dbWaybill.setBlAcceptMessage(this.getBlAcceptMessage());
|
||||||
dbWaybill.setBlGenSubbill(this.getBlGenSubbill());
|
dbWaybill.setBlGenSubbill(this.getBlGenSubbill());
|
||||||
// dbWaybill.setSignMan(this.getSignMan());
|
// dbWaybill.setSignMan(this.getSignMan());
|
||||||
// dbWaybill.setSignManCode(this.getSignManCode());
|
// dbWaybill.setSignManCode(this.getSignManCode());
|
||||||
// dbWaybill.setSignSiteCode(this.getSignSiteCode());
|
// dbWaybill.setSignSiteCode(this.getSignSiteCode());
|
||||||
// dbWaybill.setSignDate(this.getSignDate());
|
// dbWaybill.setSignDate(this.getSignDate());
|
||||||
// dbWaybill.setBillPicSendRmk(this.getBillPicSendRmk());
|
// dbWaybill.setBillPicSendRmk(this.getBillPicSendRmk());
|
||||||
// dbWaybill.setBillPicDispatchRmk(this.getBillPicDispatchRmk());
|
// dbWaybill.setBillPicDispatchRmk(this.getBillPicDispatchRmk());
|
||||||
// dbWaybill.setTimezoneOffset(this.getTimezoneOffset());
|
// dbWaybill.setTimezoneOffset(this.getTimezoneOffset());
|
||||||
// dbWaybill.setDelFlag(this.getDelFlag());
|
// dbWaybill.setDelFlag(this.getDelFlag());
|
||||||
// dbWaybill.setCreateBy(this.getCreateBy());
|
// dbWaybill.setCreateBy(this.getCreateBy());
|
||||||
// dbWaybill.setCreateTime(this.getCreateTime());
|
// dbWaybill.setCreateTime(this.getCreateTime());
|
||||||
// dbWaybill.setUpdateBy(this.getUpdateBy());
|
// dbWaybill.setUpdateBy(this.getUpdateBy());
|
||||||
// dbWaybill.setUpdateTime(this.getUpdateTime());
|
// dbWaybill.setUpdateTime(this.getUpdateTime());
|
||||||
dbWaybill.setRemark(this.getRemark());
|
dbWaybill.setRemark(this.getRemark());
|
||||||
// dbWaybill.setCreateSite(this.getCreateSite());
|
// dbWaybill.setCreateSite(this.getCreateSite());
|
||||||
// dbWaybill.setUpdateSite(this.getUpdateSite());
|
// dbWaybill.setUpdateSite(this.getUpdateSite());
|
||||||
|
|
||||||
dbWaybill.setOrderRemark(this.getOrderRemark());
|
dbWaybill.setOrderRemark(this.getOrderRemark());
|
||||||
dbWaybill.setExtInfo(this.getExtInfo());
|
dbWaybill.setExtInfo(this.getExtInfo());
|
||||||
|
|||||||
@ -230,6 +230,7 @@
|
|||||||
<result property="customerPhone" column="customer_phone" />
|
<result property="customerPhone" column="customer_phone" />
|
||||||
<result property="customerNickName" column="customer_nick_name" />
|
<result property="customerNickName" column="customer_nick_name" />
|
||||||
<result property="customerAvatar" column="customer_avatar" />
|
<result property="customerAvatar" column="customer_avatar" />
|
||||||
|
<result property="customerType" column="customer_type" />
|
||||||
|
|
||||||
<result property="blVirtual" column="bl_virtual" />
|
<result property="blVirtual" column="bl_virtual" />
|
||||||
<result property="masterBillCode" column="master_bill_code" />
|
<result property="masterBillCode" column="master_bill_code" />
|
||||||
@ -442,6 +443,7 @@
|
|||||||
a3.avatar as customer_avatar,
|
a3.avatar as customer_avatar,
|
||||||
a3.sales_support ,
|
a3.sales_support ,
|
||||||
a3.sales_executive ,
|
a3.sales_executive ,
|
||||||
|
a3.customer_type as customer_type,
|
||||||
|
|
||||||
p.emp_name as dispatch_man_name,q.site_name as print_site_name,
|
p.emp_name as dispatch_man_name,q.site_name as print_site_name,
|
||||||
r.emp_name as print_man_name,
|
r.emp_name as print_man_name,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user