WLPT_CLOUD / Base_Model · 提交

转到一个项目

作者 朱兆平
提交 5652b1acd59df031124fb298f4b169d750c1a6b7 2 个父辈 6d5f2b3d 4f8227ea

Merge branch 'master' of 118.31.66.166:WLPT_CLOUD/Base_Model

内嵌 并排对比
正在显示 11 个修改的文件 包含 321 行增加 和 46 行删除
... ... @@ -44,4 +44,17 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
</dependency>
</dependencies>
</project>
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
... ... @@ -136,6 +138,7 @@ public class AWB_AWBINFO {
private String cargoowner;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date chargetime;
private String isinstruction;
... ... @@ -178,6 +181,7 @@ public class AWB_AWBINFO {
private BigDecimal originalvol;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date crtopetime;
private String dlvpriority;
... ... @@ -190,6 +194,7 @@ public class AWB_AWBINFO {
private String crtagent;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date crtdate;
private BigDecimal extraweight;
... ... @@ -218,10 +223,12 @@ public class AWB_AWBINFO {
private String endoper;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endopetime;
private String confirmoper;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date confirmopetime;
private String csgcustomer;
... ... @@ -250,8 +257,17 @@ public class AWB_AWBINFO {
private Boolean isdelete;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date optime;
private String shpcomidpre;
private String shpcomidpno;
private String cnscomidpre;
private String cnscomidno;
public String getBillid() {
return billid;
}
... ... @@ -1243,4 +1259,36 @@ public class AWB_AWBINFO {
public void setOptime(Date optime) {
this.optime = optime;
}
public String getShpcomidpre() {
return shpcomidpre;
}
public void setShpcomidpre(String shpcomidpre) {
this.shpcomidpre = shpcomidpre;
}
public String getShpcomidpno() {
return shpcomidpno;
}
public void setShpcomidpno(String shpcomidpno) {
this.shpcomidpno = shpcomidpno;
}
public String getCnscomidpre() {
return cnscomidpre;
}
public void setCnscomidpre(String cnscomidpre) {
this.cnscomidpre = cnscomidpre;
}
public String getCnscomidno() {
return cnscomidno;
}
public void setCnscomidno(String cnscomidno) {
this.cnscomidno = cnscomidno;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
public class NMMS_CUSTOM_MT1201 {
private String uuid;
... ... @@ -13,21 +17,23 @@ 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")
private Date flightdate;
private String originstation;
private String destinationstation;
private Integer piece;
private BigDecimal piece;
private Long weight;
private BigDecimal weight;
private String splitcode;
... ... @@ -45,12 +51,18 @@ public class NMMS_CUSTOM_MT1201 {
private String ext5;
private String customText;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT1201> children;
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid == null ? null : uuid.trim();
this.uuid = uuid;
}
public String getAwba() {
... ... @@ -58,7 +70,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setAwba(String awba) {
this.awba = awba == null ? null : awba.trim();
this.awba = awba;
}
public String getAwbh() {
... ... @@ -66,7 +78,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setAwbh(String awbh) {
this.awbh = awbh == null ? null : awbh.trim();
this.awbh = awbh;
}
public String getCustomcode() {
... ... @@ -74,7 +86,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setCustomcode(String customcode) {
this.customcode = customcode == null ? null : customcode.trim();
this.customcode = customcode;
}
public String getGoodsname() {
... ... @@ -82,7 +94,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setGoodsname(String goodsname) {
this.goodsname = goodsname == null ? null : goodsname.trim();
this.goodsname = goodsname;
}
public Date getActime() {
... ... @@ -98,7 +110,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setCarrier(String carrier) {
this.carrier = carrier == null ? null : carrier.trim();
this.carrier = carrier;
}
public String getFlightno() {
... ... @@ -106,7 +118,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setFlightno(String flightno) {
this.flightno = flightno == null ? null : flightno.trim();
this.flightno = flightno;
}
public Date getFlightdate() {
... ... @@ -122,7 +134,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setOriginstation(String originstation) {
this.originstation = originstation == null ? null : originstation.trim();
this.originstation = originstation;
}
public String getDestinationstation() {
... ... @@ -130,22 +142,22 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setDestinationstation(String destinationstation) {
this.destinationstation = destinationstation == null ? null : destinationstation.trim();
this.destinationstation = destinationstation;
}
public Integer getPiece() {
public BigDecimal getPiece() {
return piece;
}
public void setPiece(Integer piece) {
public void setPiece(BigDecimal piece) {
this.piece = piece;
}
public Long getWeight() {
public BigDecimal getWeight() {
return weight;
}
public void setWeight(Long weight) {
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
... ... @@ -154,7 +166,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setSplitcode(String splitcode) {
this.splitcode = splitcode == null ? null : splitcode.trim();
this.splitcode = splitcode;
}
public String getStatus() {
... ... @@ -162,7 +174,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
this.status = status;
}
public Boolean getIsdelete() {
... ... @@ -178,7 +190,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setUldtype(String uldtype) {
this.uldtype = uldtype == null ? null : uldtype.trim();
this.uldtype = uldtype;
}
public String getUldno() {
... ... @@ -186,7 +198,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setUldno(String uldno) {
this.uldno = uldno == null ? null : uldno.trim();
this.uldno = uldno;
}
public String getPlaneno() {
... ... @@ -194,7 +206,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setPlaneno(String planeno) {
this.planeno = planeno == null ? null : planeno.trim();
this.planeno = planeno;
}
public String getOpeuserid() {
... ... @@ -202,7 +214,7 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setOpeuserid(String opeuserid) {
this.opeuserid = opeuserid == null ? null : opeuserid.trim();
this.opeuserid = opeuserid;
}
public String getExt5() {
... ... @@ -210,6 +222,30 @@ public class NMMS_CUSTOM_MT1201 {
}
public void setExt5(String ext5) {
this.ext5 = ext5 == null ? null : ext5.trim();
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 java.math.BigDecimal;
import java.util.Date;
import java.util.List;
public class NMMS_CUSTOM_MT2201 {
private String uuid;
... ... @@ -13,21 +17,23 @@ public class NMMS_CUSTOM_MT2201 {
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")
private Date flightdate;
private String originstation;
private String destinationstation;
private Integer piece;
private BigDecimal piece;
private Long weight;
private BigDecimal weight;
private String splitcode;
... ... @@ -49,12 +55,16 @@ public class NMMS_CUSTOM_MT2201 {
private String ext5;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT2201> children;
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid == null ? null : uuid.trim();
this.uuid = uuid;
}
public String getAwba() {
... ... @@ -62,7 +72,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setAwba(String awba) {
this.awba = awba == null ? null : awba.trim();
this.awba = awba;
}
public String getAwbh() {
... ... @@ -70,7 +80,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setAwbh(String awbh) {
this.awbh = awbh == null ? null : awbh.trim();
this.awbh = awbh;
}
public String getCustomcode() {
... ... @@ -78,7 +88,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setCustomcode(String customcode) {
this.customcode = customcode == null ? null : customcode.trim();
this.customcode = customcode;
}
public String getGoodsname() {
... ... @@ -86,7 +96,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setGoodsname(String goodsname) {
this.goodsname = goodsname == null ? null : goodsname.trim();
this.goodsname = goodsname;
}
public Date getActime() {
... ... @@ -102,7 +112,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setCarrier(String carrier) {
this.carrier = carrier == null ? null : carrier.trim();
this.carrier = carrier;
}
public String getFlightno() {
... ... @@ -110,7 +120,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setFlightno(String flightno) {
this.flightno = flightno == null ? null : flightno.trim();
this.flightno = flightno;
}
public Date getFlightdate() {
... ... @@ -126,7 +136,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setOriginstation(String originstation) {
this.originstation = originstation == null ? null : originstation.trim();
this.originstation = originstation;
}
public String getDestinationstation() {
... ... @@ -134,22 +144,22 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setDestinationstation(String destinationstation) {
this.destinationstation = destinationstation == null ? null : destinationstation.trim();
this.destinationstation = destinationstation;
}
public Integer getPiece() {
public BigDecimal getPiece() {
return piece;
}
public void setPiece(Integer piece) {
public void setPiece(BigDecimal piece) {
this.piece = piece;
}
public Long getWeight() {
public BigDecimal getWeight() {
return weight;
}
public void setWeight(Long weight) {
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
... ... @@ -158,7 +168,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setSplitcode(String splitcode) {
this.splitcode = splitcode == null ? null : splitcode.trim();
this.splitcode = splitcode;
}
public String getStatus() {
... ... @@ -166,7 +176,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
this.status = status;
}
public String getOffload() {
... ... @@ -174,7 +184,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setOffload(String offload) {
this.offload = offload == null ? null : offload.trim();
this.offload = offload;
}
public String getOffloaduuid() {
... ... @@ -182,7 +192,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setOffloaduuid(String offloaduuid) {
this.offloaduuid = offloaduuid == null ? null : offloaduuid.trim();
this.offloaduuid = offloaduuid;
}
public Boolean getIsdelete() {
... ... @@ -198,7 +208,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setCustomtype(String customtype) {
this.customtype = customtype == null ? null : customtype.trim();
this.customtype = customtype;
}
public String getExt2() {
... ... @@ -206,7 +216,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setExt2(String ext2) {
this.ext2 = ext2 == null ? null : ext2.trim();
this.ext2 = ext2;
}
public String getExt3() {
... ... @@ -214,7 +224,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setExt3(String ext3) {
this.ext3 = ext3 == null ? null : ext3.trim();
this.ext3 = ext3;
}
public String getExt4() {
... ... @@ -222,7 +232,7 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setExt4(String ext4) {
this.ext4 = ext4 == null ? null : ext4.trim();
this.ext4 = ext4;
}
public String getExt5() {
... ... @@ -230,6 +240,22 @@ public class NMMS_CUSTOM_MT2201 {
}
public void setExt5(String ext5) {
this.ext5 = ext5 == null ? null : ext5.trim();
this.ext5 = ext5;
}
public AWB_AWBINFO getAwbinfo() {
return awbinfo;
}
public void setAwbinfo(AWB_AWBINFO awbinfo) {
this.awbinfo = awbinfo;
}
public List<NMMS_CUSTOM_MT2201> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT2201> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
public class NMMS_CUSTOM_MT3201 {
private String uuid;
... ... @@ -13,6 +16,7 @@ public class NMMS_CUSTOM_MT3201 {
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String originstation;
... ... @@ -23,12 +27,14 @@ public class NMMS_CUSTOM_MT3201 {
private Long weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date arrivetime;
private String customcode;
private String goodsname;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date actime;
private String status;
... ... @@ -45,6 +51,10 @@ public class NMMS_CUSTOM_MT3201 {
private String ext5;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT3201> children;
public String getUuid() {
return uuid;
}
... ... @@ -212,4 +222,20 @@ public class NMMS_CUSTOM_MT3201 {
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_MT3201> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT3201> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
public class NMMS_CUSTOM_MT4201 {
private String uuid;
... ... @@ -9,6 +12,7 @@ public class NMMS_CUSTOM_MT4201 {
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String originstation;
... ... @@ -27,8 +31,10 @@ public class NMMS_CUSTOM_MT4201 {
private String goodsname;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date actime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date loadingtime;
private String specialgoods;
... ... @@ -47,6 +53,10 @@ public class NMMS_CUSTOM_MT4201 {
private String ext5;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT4201> children;
public String getUuid() {
return uuid;
}
... ... @@ -222,4 +232,20 @@ public class NMMS_CUSTOM_MT4201 {
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_MT4201> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT4201> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
public class NMMS_CUSTOM_MT520X {
private String uuid;
... ... @@ -13,6 +16,7 @@ public class NMMS_CUSTOM_MT520X {
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String originstation;
... ... @@ -23,20 +27,25 @@ public class NMMS_CUSTOM_MT520X {
private Long weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
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;
... ... @@ -49,6 +58,10 @@ public class NMMS_CUSTOM_MT520X {
private String ext5;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT520X> children;
public String getUuid() {
return uuid;
}
... ... @@ -181,6 +194,14 @@ public class NMMS_CUSTOM_MT520X {
return status;
}
public String getMessageType() {
return messageType;
}
public void setMessageType(String messageType) {
this.messageType = messageType;
}
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
... ... @@ -232,4 +253,20 @@ 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 java.util.List;
public class NMMS_CUSTOM_MT8205 {
private String uuid;
... ... @@ -35,6 +37,11 @@ public class NMMS_CUSTOM_MT8205 {
private String ext5;
private AWB_AWBINFO awbinfo;
private List<NMMS_CUSTOM_MT8205> children;
public String getUuid() {
return uuid;
}
... ... @@ -170,4 +177,20 @@ public class NMMS_CUSTOM_MT8205 {
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_MT8205> getChildren() {
return children;
}
public void setChildren(List<NMMS_CUSTOM_MT8205> children) {
this.children = children;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class NMMS_CUSTOM_RESPONSE {
private String id;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String flightno;
... ... @@ -17,6 +20,7 @@ public class NMMS_CUSTOM_RESPONSE {
private String bustype;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date busdate;
private Long busweight;
... ... @@ -35,8 +39,10 @@ public class NMMS_CUSTOM_RESPONSE {
private String cusfunctioncode;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date cusresrcvtime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date cusressendtime;
private String cusrescode;
... ... @@ -49,6 +55,12 @@ public class NMMS_CUSTOM_RESPONSE {
private String cusrestext;
private String operreason;
private String operperson;
private String opertel;
public String getId() {
return id;
}
... ... @@ -232,4 +244,28 @@ public class NMMS_CUSTOM_RESPONSE {
public void setCusrestext(String cusrestext) {
this.cusrestext = cusrestext == null ? null : cusrestext.trim();
}
public String getOperreason() {
return operreason;
}
public void setOperreason(String operreason) {
this.operreason = operreason;
}
public String getOperperson() {
return operperson;
}
public void setOperperson(String operperson) {
this.operperson = operperson;
}
public String getOpertel() {
return opertel;
}
public void setOpertel(String opertel) {
this.opertel = opertel;
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class NMMS_FFM_INFO {
private String autoid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createdate;
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String waybillnomaster;
... ...