WLPT_CLOUD / Base_Model · 提交

转到一个项目

作者 朱兆平
提交 b35fdb38ffeafd7f3ffc5e4d0a6559464fbb25a0 2 个父辈 d6340375 0a121f35

Merge branch 'master' of 118.31.66.166:WLPT_CLOUD/Base_Model 

 Conflicts:
	.gitignore
	src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT520X.java
内嵌 并排对比
正在显示 3 个修改的文件 包含 226 行增加 和 219 行删除
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class NMMS_CUSTOM_MT1201 {
private String carrierno;
private String rcfdep;
private String segment;
private String uuid;
private String waybill;
private String awba;
private String awbh;
... ... @@ -17,14 +22,12 @@ public class NMMS_CUSTOM_MT1201 {
private String goodsname;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date actime;
private String carrier;
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date flightdate;
private String originstation;
... ... @@ -33,6 +36,10 @@ public class NMMS_CUSTOM_MT1201 {
private BigDecimal piece;
private BigDecimal pcs;
private BigDecimal wei;
private BigDecimal weight;
private String splitcode;
... ... @@ -57,195 +64,6 @@ public class NMMS_CUSTOM_MT1201 {
private List<NMMS_CUSTOM_MT1201> children;
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public String getAwba() {
return awba;
}
public void setAwba(String awba) {
this.awba = awba;
}
public String getAwbh() {
return awbh;
}
public void setAwbh(String awbh) {
this.awbh = awbh;
}
public String getCustomcode() {
return customcode;
}
public void setCustomcode(String customcode) {
this.customcode = customcode;
}
public String getGoodsname() {
return goodsname;
}
public void setGoodsname(String goodsname) {
this.goodsname = goodsname;
}
public Date getActime() {
return actime;
}
public void setActime(Date actime) {
this.actime = actime;
}
public String getCarrier() {
return carrier;
}
public void setCarrier(String carrier) {
this.carrier = carrier;
}
public String getFlightno() {
return flightno;
}
public void setFlightno(String flightno) {
this.flightno = flightno;
}
public Date getFlightdate() {
return flightdate;
}
public void setFlightdate(Date flightdate) {
this.flightdate = flightdate;
}
public String getOriginstation() {
return originstation;
}
public void setOriginstation(String originstation) {
this.originstation = originstation;
}
public String getDestinationstation() {
return destinationstation;
}
public void setDestinationstation(String destinationstation) {
this.destinationstation = destinationstation;
}
public BigDecimal getPiece() {
return piece;
}
public void setPiece(BigDecimal piece) {
this.piece = piece;
}
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public String getSplitcode() {
return splitcode;
}
public void setSplitcode(String splitcode) {
this.splitcode = splitcode;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Boolean getIsdelete() {
return isdelete;
}
public void setIsdelete(Boolean isdelete) {
this.isdelete = isdelete;
}
public String getUldtype() {
return uldtype;
}
public void setUldtype(String uldtype) {
this.uldtype = uldtype;
}
public String getUldno() {
return uldno;
}
public void setUldno(String uldno) {
this.uldno = uldno;
}
public String getPlaneno() {
return planeno;
}
public void setPlaneno(String planeno) {
this.planeno = planeno;
}
public String getOpeuserid() {
return opeuserid;
}
public void setOpeuserid(String opeuserid) {
this.opeuserid = opeuserid;
}
public String getExt5() {
return ext5;
}
public void setExt5(String ext5) {
this.ext5 = ext5;
}
public String getCustomText() {
return customText;
}
public void setCustomText(String customText) {
this.customText = customText;
}
public AWB_AWBINFO getAwbinfo() {
return awbinfo;
}
public void setAwbinfo(AWB_AWBINFO awbinfo) {
this.awbinfo = awbinfo;
}
public List<NMMS_CUSTOM_MT1201> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT1201> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class NMMS_CUSTOM_MT520X {
private String carrierno;
private String segment;
private String uuid;
private String waybill;
private String customText;
private String awba;
private String awbh;
... ... @@ -15,8 +20,7 @@ public class NMMS_CUSTOM_MT520X {
private String carrier;
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date flightdate;
private String originstation;
... ... @@ -26,27 +30,21 @@ public class NMMS_CUSTOM_MT520X {
private Integer piece;
private Long weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date starttime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endtime;
private String customcode;
private String goodsname;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date actime;
private String rcfdep;
private String status;
//去掉
// private String messageType;
private Boolean isdelete;
private String ext1;
... ... @@ -246,20 +244,4 @@ public class NMMS_CUSTOM_MT520X {
public void setExt5(String ext5) {
this.ext5 = ext5 == null ? null : ext5.trim();
}
public AWB_AWBINFO getAwbinfo() {
return awbinfo;
}
public void setAwbinfo(AWB_AWBINFO awbinfo) {
this.awbinfo = awbinfo;
}
public List<NMMS_CUSTOM_MT520X> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT520X> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class NMMS_CUSTOM_TRANS {
private String uuid;
private String uuid1201;
private String awba;
private String carrier;
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date flightdate;
private String turnpiece;
private Long turnweight;
private String customcode;
private String turnunloading;
private String pno;
private String status;
private String turntype;
private String goodsname;
private Boolean isdelete;
private String ext1;
private String ext2;
private String ext3;
private String ext4;
private String ext5;
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid == null ? null : uuid.trim();
}
public String getUuid1201() {
return uuid1201;
}
public void setUuid1201(String uuid1201) {
this.uuid1201 = uuid1201 == null ? null : uuid1201.trim();
}
public String getAwba() {
return awba;
}
public void setAwba(String awba) {
this.awba = awba == null ? null : awba.trim();
}
public String getCarrier() {
return carrier;
}
public void setCarrier(String carrier) {
this.carrier = carrier == null ? null : carrier.trim();
}
public String getFlightno() {
return flightno;
}
public void setFlightno(String flightno) {
this.flightno = flightno == null ? null : flightno.trim();
}
public Date getFlightdate() {
return flightdate;
}
public void setFlightdate(Date flightdate) {
this.flightdate = flightdate;
}
public String getTurnpiece() {
return turnpiece;
}
public void setTurnpiece(String turnpiece) {
this.turnpiece = turnpiece == null ? null : turnpiece.trim();
}
public Long getTurnweight() {
return turnweight;
}
public void setTurnweight(Long turnweight) {
this.turnweight = turnweight;
}
public String getCustomcode() {
return customcode;
}
public void setCustomcode(String customcode) {
this.customcode = customcode == null ? null : customcode.trim();
}
public String getTurnunloading() {
return turnunloading;
}
public void setTurnunloading(String turnunloading) {
this.turnunloading = turnunloading == null ? null : turnunloading.trim();
}
public String getPno() {
return pno;
}
public void setPno(String pno) {
this.pno = pno == null ? null : pno.trim();
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
public String getTurntype() {
return turntype;
}
public void setTurntype(String turntype) {
this.turntype = turntype == null ? null : turntype.trim();
}
public String getGoodsname() {
return goodsname;
}
public void setGoodsname(String goodsname) {
this.goodsname = goodsname == null ? null : goodsname.trim();
}
public Boolean getIsdelete() {
return isdelete;
}
public void setIsdelete(Boolean isdelete) {
this.isdelete = isdelete;
}
public String getExt1() {
return ext1;
}
public void setExt1(String ext1) {
this.ext1 = ext1 == null ? null : ext1.trim();
}
public String getExt2() {
return ext2;
}
public void setExt2(String ext2) {
this.ext2 = ext2 == null ? null : ext2.trim();
}
public String getExt3() {
return ext3;
}
public void setExt3(String ext3) {
this.ext3 = ext3 == null ? null : ext3.trim();
}
public String getExt4() {
return ext4;
}
public void setExt4(String ext4) {
this.ext4 = ext4 == null ? null : ext4.trim();
}
public String getExt5() {
return ext5;
}
public void setExt5(String ext5) {
this.ext5 = ext5 == null ? null : ext5.trim();
}
}
\ No newline at end of file
... ...