1201,5201，分拨实体增加字段

@@ -9,8 +9,11 @@ import java.util.List;
 
 
 @Data
 @Data
 public class NMMS_CUSTOM_MT1201 {
 public class NMMS_CUSTOM_MT1201 {
+    private String carrierno;
+    private String rcfdep;
+    private String segment;
     private String uuid;
     private String uuid;
-
+    private String waybill;
     private String awba;
     private String awba;
 
 
     private String awbh;
     private String awbh;
@@ -24,8 +27,7 @@ public class NMMS_CUSTOM_MT1201 {
     private String carrier;
     private String carrier;
 
 
     private String flightno;
     private String flightno;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date flightdate;
     private Date flightdate;
 
 
     private String originstation;
     private String originstation;
@@ -34,6 +36,10 @@ public class NMMS_CUSTOM_MT1201 {
 
 
     private BigDecimal piece;
     private BigDecimal piece;
 
 
+    private BigDecimal pcs;
+
+    private BigDecimal wei;
+
     private BigDecimal weight;
     private BigDecimal weight;
 
 
     private String splitcode;
     private String splitcode;

 package com.sunyo.wlpt.base.model;
 package com.sunyo.wlpt.base.model;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -7,8 +8,11 @@ import java.util.List;
 
 
 @Data
 @Data
 public class NMMS_CUSTOM_MT520X {
 public class NMMS_CUSTOM_MT520X {
+    private String carrierno;
+    private String segment;
     private String uuid;
     private String uuid;
-
+    private String waybill;
+    private String customText;
     private String awba;
     private String awba;
 
 
     private String awbh;
     private String awbh;
@@ -16,7 +20,7 @@ public class NMMS_CUSTOM_MT520X {
     private String carrier;
     private String carrier;
 
 
     private String flightno;
     private String flightno;
-
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date flightdate;
     private Date flightdate;
 
 
     private String originstation;
     private String originstation;
@@ -26,7 +30,7 @@ public class NMMS_CUSTOM_MT520X {
     private Integer piece;
     private Integer piece;
 
 
     private Long weight;
     private Long weight;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date starttime;
     private Date starttime;
 
 
     private Date endtime;
     private Date endtime;

+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();
+    }
+}