Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
Jiaqi.xu
841d9a46 1 parent 5ded05cf

EANNO字段获取

Inline Side-by-side
Showing 5 changed files with 14 additions and 6 deletions
...@@ -234,9 +234,9 @@ public class BasfMawb implements Serializable { ...@@ -234,9 +234,9 @@ public class BasfMawb implements Serializable {
234 @Column(name = "CONSIGNMENTCODEID") 234 @Column(name = "CONSIGNMENTCODEID")
235 private Long consignmentCodeId; 235 private Long consignmentCodeId;
236 236
237 - @ApiModelProperty(value = "EANNo", name = "EANNo", example = "") 237 + @ApiModelProperty(value = "eanNo", name = "eanNo", example = "")
238 @Column(name = "EANNO") 238 @Column(name = "EANNO")
239 - private String EANNo; 239 + private String eanNo;
240 240
241 @Valid 241 @Valid
242 @ApiModelProperty(value = "运单明细", name = "BasfMawbDetail", example = "") 242 @ApiModelProperty(value = "运单明细", name = "BasfMawbDetail", example = "")
......
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
16 16
17 @ApiModel(value = "basfc", description = "主运单") 17 @ApiModel(value = "basfc", description = "主运单")
18 @Entity 18 @Entity
19 -@Table(name = "T_ICLEAR_API_BASFC") 19 +@Table(name = "T_ICLEAR_API_MAWB")
20 @DynamicInsert 20 @DynamicInsert
21 @DynamicUpdate 21 @DynamicUpdate
22 @Data 22 @Data
...@@ -86,9 +86,9 @@ public class Basfc implements Serializable { ...@@ -86,9 +86,9 @@ public class Basfc implements Serializable {
86 @Column(name = "OPERATESCC") 86 @Column(name = "OPERATESCC")
87 private String operateSCC; 87 private String operateSCC;
88 88
89 - @ApiModelProperty(value = "EANNo", name = "EANNo") 89 + @ApiModelProperty(value = "eanNo", name = "eanNo")
90 @Column(name = "EANNO") 90 @Column(name = "EANNO")
91 - private String EANNo; 91 + private String eanNo;
92 92
93 @Valid 93 @Valid
94 @ApiModelProperty(value = "运单明细", name = "consignmentList", example = "") 94 @ApiModelProperty(value = "运单明细", name = "consignmentList", example = "")
......
...@@ -400,6 +400,12 @@ public class ChmConsignment implements Serializable { ...@@ -400,6 +400,12 @@ public class ChmConsignment implements Serializable {
400 @Column(name = "PORT_NAME") 400 @Column(name = "PORT_NAME")
401 private String portName; 401 private String portName;
402 402
403 + /**
404 + * EANNO
405 + */
406 + @Column(name = "EANNO")
407 + private String eanNo;
408 +
403 @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL) 409 @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
404 private List<ChmConsignmentDetail> chmConsignmentDetailList; 410 private List<ChmConsignmentDetail> chmConsignmentDetailList;
405 411
......
...@@ -74,7 +74,7 @@ public class BasfService { ...@@ -74,7 +74,7 @@ public class BasfService {
74 //发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型 74 //发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型
75 basfMawb.setTradeCodeScc(basfc.getShipperSCC()); 75 basfMawb.setTradeCodeScc(basfc.getShipperSCC());
76 76
77 - basfMawb.setEANNo(basfc.getEANNo()); 77 + basfMawb.setEanNo(basfc.getEanNo());
78 //明细 78 //明细
79 List<BasfMawbDetail> mawbDetailList = new ArrayList<>(); 79 List<BasfMawbDetail> mawbDetailList = new ArrayList<>();
80 if (basfc.getConsignmentList().size()>0){ 80 if (basfc.getConsignmentList().size()>0){
......
...@@ -269,6 +269,8 @@ public class ChmConsignmentService { ...@@ -269,6 +269,8 @@ public class ChmConsignmentService {
269 result.setOwnerCode(mawb.getOwnerCode()); 269 result.setOwnerCode(mawb.getOwnerCode());
270 //经营单位社会信用证代码 270 //经营单位社会信用证代码
271 result.setOwnerCodeScc(mawb.getOwnerCodeScc()); 271 result.setOwnerCodeScc(mawb.getOwnerCodeScc());
272 + //EANNO
273 + result.setEanNo(mawb.getEanNo());
272 274
273 /*//TODO 生产核销单位统一信用代码---报关形式类型 275 /*//TODO 生产核销单位统一信用代码---报关形式类型
274 result.setTradeCoSCC(mawb.getTradeCodeScc()); 276 result.setTradeCoSCC(mawb.getTradeCodeScc());
......