作者 zhangFan

change model

@@ -31,4 +31,17 @@ @@ -31,4 +31,17 @@
31 </plugin> 31 </plugin>
32 </plugins> 32 </plugins>
33 </build> 33 </build>
  34 + <dependencies>
  35 + <dependency>
  36 + <groupId>com.fasterxml.jackson.core</groupId>
  37 + <artifactId>jackson-annotations</artifactId>
  38 + <version>2.9.5</version>
  39 + <scope>compile</scope>
  40 + </dependency>
  41 + <dependency>
  42 + <groupId>org.projectlombok</groupId>
  43 + <artifactId>lombok</artifactId>
  44 + <version>1.18.8</version>
  45 + </dependency>
  46 + </dependencies>
34 </project> 47 </project>
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import lombok.Data;
  5 +
3 import java.math.BigDecimal; 6 import java.math.BigDecimal;
4 import java.util.Date; 7 import java.util.Date;
5 - 8 +@Data
6 public class AWB_AWBINFO { 9 public class AWB_AWBINFO {
7 private String billid; 10 private String billid;
8 11
@@ -178,6 +181,7 @@ public class AWB_AWBINFO { @@ -178,6 +181,7 @@ public class AWB_AWBINFO {
178 181
179 private BigDecimal originalvol; 182 private BigDecimal originalvol;
180 183
  184 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
181 private Date crtopetime; 185 private Date crtopetime;
182 186
183 private String dlvpriority; 187 private String dlvpriority;
@@ -218,10 +222,12 @@ public class AWB_AWBINFO { @@ -218,10 +222,12 @@ public class AWB_AWBINFO {
218 222
219 private String endoper; 223 private String endoper;
220 224
  225 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
221 private Date endopetime; 226 private Date endopetime;
222 227
223 private String confirmoper; 228 private String confirmoper;
224 229
  230 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
225 private Date confirmopetime; 231 private Date confirmopetime;
226 232
227 private String csgcustomer; 233 private String csgcustomer;
@@ -250,8 +256,17 @@ public class AWB_AWBINFO { @@ -250,8 +256,17 @@ public class AWB_AWBINFO {
250 256
251 private Boolean isdelete; 257 private Boolean isdelete;
252 258
  259 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
253 private Date optime; 260 private Date optime;
254 261
  262 + private String shpcomidpre;
  263 +
  264 + private String shpcomidpno;
  265 +
  266 + private String cnscomidpre;
  267 +
  268 + private String cnscomidno;
  269 +
255 public String getBillid() { 270 public String getBillid() {
256 return billid; 271 return billid;
257 } 272 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import lombok.Data;
  5 +
  6 +import java.math.BigDecimal;
3 import java.util.Date; 7 import java.util.Date;
  8 +import java.util.List;
4 9
  10 +@Data
5 public class NMMS_CUSTOM_MT1201 { 11 public class NMMS_CUSTOM_MT1201 {
6 private String uuid; 12 private String uuid;
7 13
@@ -19,15 +25,16 @@ public class NMMS_CUSTOM_MT1201 { @@ -19,15 +25,16 @@ public class NMMS_CUSTOM_MT1201 {
19 25
20 private String flightno; 26 private String flightno;
21 27
  28 + @JsonFormat(pattern = "yyyy-MM-dd")
22 private Date flightdate; 29 private Date flightdate;
23 30
24 private String originstation; 31 private String originstation;
25 32
26 private String destinationstation; 33 private String destinationstation;
27 34
28 - private Integer piece; 35 + private BigDecimal piece;
29 36
30 - private Long weight; 37 + private BigDecimal weight;
31 38
32 private String splitcode; 39 private String splitcode;
33 40
@@ -45,171 +52,12 @@ public class NMMS_CUSTOM_MT1201 { @@ -45,171 +52,12 @@ public class NMMS_CUSTOM_MT1201 {
45 52
46 private String ext5; 53 private String ext5;
47 54
48 - public String getUuid() {  
49 - return uuid;  
50 - }  
51 -  
52 - public void setUuid(String uuid) {  
53 - this.uuid = uuid == null ? null : uuid.trim();  
54 - }  
55 -  
56 - public String getAwba() {  
57 - return awba;  
58 - }  
59 -  
60 - public void setAwba(String awba) {  
61 - this.awba = awba == null ? null : awba.trim();  
62 - }  
63 -  
64 - public String getAwbh() {  
65 - return awbh;  
66 - }  
67 -  
68 - public void setAwbh(String awbh) {  
69 - this.awbh = awbh == null ? null : awbh.trim();  
70 - }  
71 -  
72 - public String getCustomcode() {  
73 - return customcode;  
74 - }  
75 -  
76 - public void setCustomcode(String customcode) {  
77 - this.customcode = customcode == null ? null : customcode.trim();  
78 - }  
79 -  
80 - public String getGoodsname() {  
81 - return goodsname;  
82 - }  
83 -  
84 - public void setGoodsname(String goodsname) {  
85 - this.goodsname = goodsname == null ? null : goodsname.trim();  
86 - }  
87 -  
88 - public Date getActime() {  
89 - return actime;  
90 - }  
91 -  
92 - public void setActime(Date actime) {  
93 - this.actime = actime;  
94 - }  
95 -  
96 - public String getCarrier() {  
97 - return carrier;  
98 - }  
99 -  
100 - public void setCarrier(String carrier) {  
101 - this.carrier = carrier == null ? null : carrier.trim();  
102 - }  
103 -  
104 - public String getFlightno() {  
105 - return flightno;  
106 - }  
107 -  
108 - public void setFlightno(String flightno) {  
109 - this.flightno = flightno == null ? null : flightno.trim();  
110 - }  
111 -  
112 - public Date getFlightdate() {  
113 - return flightdate;  
114 - }  
115 -  
116 - public void setFlightdate(Date flightdate) {  
117 - this.flightdate = flightdate;  
118 - }  
119 -  
120 - public String getOriginstation() {  
121 - return originstation;  
122 - }  
123 -  
124 - public void setOriginstation(String originstation) {  
125 - this.originstation = originstation == null ? null : originstation.trim();  
126 - }  
127 -  
128 - public String getDestinationstation() {  
129 - return destinationstation;  
130 - }  
131 -  
132 - public void setDestinationstation(String destinationstation) {  
133 - this.destinationstation = destinationstation == null ? null : destinationstation.trim();  
134 - }  
135 -  
136 - public Integer getPiece() {  
137 - return piece;  
138 - }  
139 -  
140 - public void setPiece(Integer piece) {  
141 - this.piece = piece;  
142 - }  
143 -  
144 - public Long getWeight() {  
145 - return weight;  
146 - }  
147 -  
148 - public void setWeight(Long weight) {  
149 - this.weight = weight;  
150 - }  
151 -  
152 - public String getSplitcode() {  
153 - return splitcode;  
154 - }  
155 -  
156 - public void setSplitcode(String splitcode) {  
157 - this.splitcode = splitcode == null ? null : splitcode.trim();  
158 - }  
159 -  
160 - public String getStatus() {  
161 - return status;  
162 - }  
163 -  
164 - public void setStatus(String status) {  
165 - this.status = status == null ? null : status.trim();  
166 - }  
167 -  
168 - public Boolean getIsdelete() {  
169 - return isdelete;  
170 - }  
171 -  
172 - public void setIsdelete(Boolean isdelete) {  
173 - this.isdelete = isdelete;  
174 - }  
175 -  
176 - public String getUldtype() {  
177 - return uldtype;  
178 - }  
179 -  
180 - public void setUldtype(String uldtype) {  
181 - this.uldtype = uldtype == null ? null : uldtype.trim();  
182 - }  
183 -  
184 - public String getUldno() {  
185 - return uldno;  
186 - }  
187 -  
188 - public void setUldno(String uldno) {  
189 - this.uldno = uldno == null ? null : uldno.trim();  
190 - }  
191 -  
192 - public String getPlaneno() {  
193 - return planeno;  
194 - } 55 + private String customText;
195 56
196 - public void setPlaneno(String planeno) {  
197 - this.planeno = planeno == null ? null : planeno.trim();  
198 - } 57 + private AWB_AWBINFO awbinfo;
199 58
200 - public String getOpeuserid() {  
201 - return opeuserid;  
202 - } 59 + private List<NMMS_CUSTOM_MT1201> children;
203 60
204 - public void setOpeuserid(String opeuserid) {  
205 - this.opeuserid = opeuserid == null ? null : opeuserid.trim();  
206 - }  
207 61
208 - public String getExt5() {  
209 - return ext5;  
210 - }  
211 62
212 - public void setExt5(String ext5) {  
213 - this.ext5 = ext5 == null ? null : ext5.trim();  
214 - }  
215 } 63 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import lombok.Data;
  4 +
  5 +import java.math.BigDecimal;
3 import java.util.Date; 6 import java.util.Date;
  7 +import java.util.List;
4 8
  9 +@Data
5 public class NMMS_CUSTOM_MT2201 { 10 public class NMMS_CUSTOM_MT2201 {
6 private String uuid; 11 private String uuid;
7 12
@@ -25,9 +30,9 @@ public class NMMS_CUSTOM_MT2201 { @@ -25,9 +30,9 @@ public class NMMS_CUSTOM_MT2201 {
25 30
26 private String destinationstation; 31 private String destinationstation;
27 32
28 - private Integer piece; 33 + private BigDecimal piece;
29 34
30 - private Long weight; 35 + private BigDecimal weight;
31 36
32 private String splitcode; 37 private String splitcode;
33 38
@@ -49,187 +54,8 @@ public class NMMS_CUSTOM_MT2201 { @@ -49,187 +54,8 @@ public class NMMS_CUSTOM_MT2201 {
49 54
50 private String ext5; 55 private String ext5;
51 56
52 - public String getUuid() {  
53 - return uuid;  
54 - }  
55 -  
56 - public void setUuid(String uuid) {  
57 - this.uuid = uuid == null ? null : uuid.trim();  
58 - }  
59 -  
60 - public String getAwba() {  
61 - return awba;  
62 - }  
63 -  
64 - public void setAwba(String awba) {  
65 - this.awba = awba == null ? null : awba.trim();  
66 - }  
67 -  
68 - public String getAwbh() {  
69 - return awbh;  
70 - }  
71 -  
72 - public void setAwbh(String awbh) {  
73 - this.awbh = awbh == null ? null : awbh.trim();  
74 - }  
75 -  
76 - public String getCustomcode() {  
77 - return customcode;  
78 - }  
79 -  
80 - public void setCustomcode(String customcode) {  
81 - this.customcode = customcode == null ? null : customcode.trim();  
82 - }  
83 -  
84 - public String getGoodsname() {  
85 - return goodsname;  
86 - }  
87 -  
88 - public void setGoodsname(String goodsname) {  
89 - this.goodsname = goodsname == null ? null : goodsname.trim();  
90 - }  
91 -  
92 - public Date getActime() {  
93 - return actime;  
94 - }  
95 -  
96 - public void setActime(Date actime) {  
97 - this.actime = actime;  
98 - }  
99 -  
100 - public String getCarrier() {  
101 - return carrier;  
102 - }  
103 -  
104 - public void setCarrier(String carrier) {  
105 - this.carrier = carrier == null ? null : carrier.trim();  
106 - }  
107 -  
108 - public String getFlightno() {  
109 - return flightno;  
110 - }  
111 -  
112 - public void setFlightno(String flightno) {  
113 - this.flightno = flightno == null ? null : flightno.trim();  
114 - }  
115 -  
116 - public Date getFlightdate() {  
117 - return flightdate;  
118 - }  
119 -  
120 - public void setFlightdate(Date flightdate) {  
121 - this.flightdate = flightdate;  
122 - }  
123 -  
124 - public String getOriginstation() {  
125 - return originstation;  
126 - }  
127 -  
128 - public void setOriginstation(String originstation) {  
129 - this.originstation = originstation == null ? null : originstation.trim();  
130 - }  
131 -  
132 - public String getDestinationstation() {  
133 - return destinationstation;  
134 - }  
135 -  
136 - public void setDestinationstation(String destinationstation) {  
137 - this.destinationstation = destinationstation == null ? null : destinationstation.trim();  
138 - }  
139 -  
140 - public Integer getPiece() {  
141 - return piece;  
142 - }  
143 -  
144 - public void setPiece(Integer piece) {  
145 - this.piece = piece;  
146 - }  
147 -  
148 - public Long getWeight() {  
149 - return weight;  
150 - }  
151 -  
152 - public void setWeight(Long weight) {  
153 - this.weight = weight;  
154 - }  
155 -  
156 - public String getSplitcode() {  
157 - return splitcode;  
158 - }  
159 -  
160 - public void setSplitcode(String splitcode) {  
161 - this.splitcode = splitcode == null ? null : splitcode.trim();  
162 - }  
163 -  
164 - public String getStatus() {  
165 - return status;  
166 - }  
167 -  
168 - public void setStatus(String status) {  
169 - this.status = status == null ? null : status.trim();  
170 - }  
171 -  
172 - public String getOffload() {  
173 - return offload;  
174 - }  
175 -  
176 - public void setOffload(String offload) {  
177 - this.offload = offload == null ? null : offload.trim();  
178 - }  
179 -  
180 - public String getOffloaduuid() {  
181 - return offloaduuid;  
182 - }  
183 -  
184 - public void setOffloaduuid(String offloaduuid) {  
185 - this.offloaduuid = offloaduuid == null ? null : offloaduuid.trim();  
186 - }  
187 -  
188 - public Boolean getIsdelete() {  
189 - return isdelete;  
190 - }  
191 -  
192 - public void setIsdelete(Boolean isdelete) {  
193 - this.isdelete = isdelete;  
194 - }  
195 -  
196 - public String getCustomtype() {  
197 - return customtype;  
198 - }  
199 -  
200 - public void setCustomtype(String customtype) {  
201 - this.customtype = customtype == null ? null : customtype.trim();  
202 - }  
203 -  
204 - public String getExt2() {  
205 - return ext2;  
206 - }  
207 -  
208 - public void setExt2(String ext2) {  
209 - this.ext2 = ext2 == null ? null : ext2.trim();  
210 - }  
211 -  
212 - public String getExt3() {  
213 - return ext3;  
214 - }  
215 -  
216 - public void setExt3(String ext3) {  
217 - this.ext3 = ext3 == null ? null : ext3.trim();  
218 - }  
219 -  
220 - public String getExt4() {  
221 - return ext4;  
222 - }  
223 -  
224 - public void setExt4(String ext4) {  
225 - this.ext4 = ext4 == null ? null : ext4.trim();  
226 - } 57 + private AWB_AWBINFO awbinfo;
227 58
228 - public String getExt5() {  
229 - return ext5;  
230 - } 59 + private List<NMMS_CUSTOM_MT2201> children;
231 60
232 - public void setExt5(String ext5) {  
233 - this.ext5 = ext5 == null ? null : ext5.trim();  
234 - }  
235 } 61 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import lombok.Data;
  4 +
3 import java.util.Date; 5 import java.util.Date;
  6 +import java.util.List;
4 7
  8 +@Data
5 public class NMMS_CUSTOM_MT3201 { 9 public class NMMS_CUSTOM_MT3201 {
6 private String uuid; 10 private String uuid;
7 11
@@ -45,6 +49,11 @@ public class NMMS_CUSTOM_MT3201 { @@ -45,6 +49,11 @@ public class NMMS_CUSTOM_MT3201 {
45 49
46 private String ext5; 50 private String ext5;
47 51
  52 +
  53 + private AWB_AWBINFO awbinfo;
  54 +
  55 + private List<NMMS_CUSTOM_MT3201> children;
  56 +
48 public String getUuid() { 57 public String getUuid() {
49 return uuid; 58 return uuid;
50 } 59 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import lombok.Data;
  4 +
3 import java.util.Date; 5 import java.util.Date;
  6 +import java.util.List;
4 7
  8 +@Data
5 public class NMMS_CUSTOM_MT4201 { 9 public class NMMS_CUSTOM_MT4201 {
6 private String uuid; 10 private String uuid;
7 11
@@ -47,6 +51,10 @@ public class NMMS_CUSTOM_MT4201 { @@ -47,6 +51,10 @@ public class NMMS_CUSTOM_MT4201 {
47 51
48 private String ext5; 52 private String ext5;
49 53
  54 + private AWB_AWBINFO awbinfo;
  55 +
  56 + private List<NMMS_CUSTOM_MT4201> children;
  57 +
50 public String getUuid() { 58 public String getUuid() {
51 return uuid; 59 return uuid;
52 } 60 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import lombok.Data;
  4 +
3 import java.util.Date; 5 import java.util.Date;
  6 +import java.util.List;
4 7
  8 +@Data
5 public class NMMS_CUSTOM_MT520X { 9 public class NMMS_CUSTOM_MT520X {
6 private String uuid; 10 private String uuid;
7 11
@@ -49,6 +53,10 @@ public class NMMS_CUSTOM_MT520X { @@ -49,6 +53,10 @@ public class NMMS_CUSTOM_MT520X {
49 53
50 private String ext5; 54 private String ext5;
51 55
  56 + private AWB_AWBINFO awbinfo;
  57 +
  58 + private List<NMMS_CUSTOM_MT520X> children;
  59 +
52 public String getUuid() { 60 public String getUuid() {
53 return uuid; 61 return uuid;
54 } 62 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
  3 +import lombok.Data;
  4 +
  5 +import java.util.List;
  6 +
  7 +@Data
3 public class NMMS_CUSTOM_MT8205 { 8 public class NMMS_CUSTOM_MT8205 {
4 private String uuid; 9 private String uuid;
5 10
@@ -35,6 +40,11 @@ public class NMMS_CUSTOM_MT8205 { @@ -35,6 +40,11 @@ public class NMMS_CUSTOM_MT8205 {
35 40
36 private String ext5; 41 private String ext5;
37 42
  43 + private AWB_AWBINFO awbinfo;
  44 +
  45 + private List<NMMS_CUSTOM_MT8205> children;
  46 +
  47 +
38 public String getUuid() { 48 public String getUuid() {
39 return uuid; 49 return uuid;
40 } 50 }