aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-04-28 13:55:09 +08:00
parent a0651f4aec
commit eb73338afa
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -69,6 +69,10 @@ public class WaybillOrder implements Serializable {
/* 快递线路 */ /* 快递线路 */
private String transLine; private String transLine;
/* 时效 */
private String timeType;
/* 计泡比例 */
private String meterType;
/* 快递产品类型 */ /* 快递产品类型 */
private String productType; private String productType;
@ -79,6 +83,10 @@ public class WaybillOrder implements Serializable {
/* 报关方式 */ /* 报关方式 */
private String customsEclaration; private String customsEclaration;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date estimateDate;
/* 包装类型 */ /* 包装类型 */
private String packType; private String packType;
@ -335,13 +343,13 @@ public class WaybillOrder implements Serializable {
voItem.setTransLine(dbWaybill.getTransLineType()); voItem.setTransLine(dbWaybill.getTransLineType());
voItem.setProductType(dbWaybill.getProductType()); voItem.setProductType(dbWaybill.getProductType());
// voItem.setTimeType(dbWaybill.getTimeType()); voItem.setTimeType(dbWaybill.getTimeType());
// voItem.setMeterType(dbWaybill.getMeterType()); voItem.setMeterType(dbWaybill.getMeterType());
voItem.setCustomsClear(dbWaybill.getCustomsClear()); voItem.setCustomsClear(dbWaybill.getCustomsClear());
voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration()); voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration());
// voItem.setEstimateDate(dbWaybill.getEstimateDate()); voItem.setEstimateDate(dbWaybill.getEstimateDate());
voItem.setPackType(dbWaybill.getPackType()); voItem.setPackType(dbWaybill.getPackType());
voItem.setDispatchMethod(dbWaybill.getDispatchMethod()); voItem.setDispatchMethod(dbWaybill.getDispatchMethod());
@ -543,13 +551,13 @@ public class WaybillOrder implements Serializable {
dbWaybill.setTransLineType(this.getTransLine()); dbWaybill.setTransLineType(this.getTransLine());
dbWaybill.setProductType(this.getProductType()); dbWaybill.setProductType(this.getProductType());
// dbWaybill.setTimeType(this.getTimeType()); dbWaybill.setTimeType(this.getTimeType());
// dbWaybill.setMeterType(this.getMeterType()); dbWaybill.setMeterType(this.getMeterType());
dbWaybill.setCustomsClear(this.getCustomsClear()); dbWaybill.setCustomsClear(this.getCustomsClear());
dbWaybill.setCustomsEclaration(this.getCustomsEclaration()); dbWaybill.setCustomsEclaration(this.getCustomsEclaration());
// dbWaybill.setEstimateDate(this.getEstimateDate()); dbWaybill.setEstimateDate(this.getEstimateDate());
dbWaybill.setPackType(this.getPackType()); dbWaybill.setPackType(this.getPackType());
dbWaybill.setDispatchMethod(this.getDispatchMethod()); dbWaybill.setDispatchMethod(this.getDispatchMethod());