Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Jiaqi.xu
2021-11-23 15:30:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
841d9a46443ef5df5aaa76c28d702791efcf9c0c
841d9a46
1 parent
5ded05cf
EANNO字段获取
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
6 deletions
src/main/java/com/erry/iclear/dateInterface/api/request/BasfMawb.java
src/main/java/com/erry/iclear/dateInterface/api/request/Basfc.java
src/main/java/com/erry/iclear/dateInterface/entity/ChmConsignment.java
src/main/java/com/erry/iclear/dateInterface/service/BasfService.java
src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentService.java
src/main/java/com/erry/iclear/dateInterface/api/request/BasfMawb.java
View file @
841d9a4
...
...
@@ -234,9 +234,9 @@ public class BasfMawb implements Serializable {
@Column
(
name
=
"CONSIGNMENTCODEID"
)
private
Long
consignmentCodeId
;
@ApiModelProperty
(
value
=
"
EANNo"
,
name
=
"EAN
No"
,
example
=
""
)
@ApiModelProperty
(
value
=
"
eanNo"
,
name
=
"ean
No"
,
example
=
""
)
@Column
(
name
=
"EANNO"
)
private
String
EAN
No
;
private
String
ean
No
;
@Valid
@ApiModelProperty
(
value
=
"运单明细"
,
name
=
"BasfMawbDetail"
,
example
=
""
)
...
...
src/main/java/com/erry/iclear/dateInterface/api/request/Basfc.java
View file @
841d9a4
...
...
@@ -16,7 +16,7 @@ import java.util.List;
@ApiModel
(
value
=
"basfc"
,
description
=
"主运单"
)
@Entity
@Table
(
name
=
"T_ICLEAR_API_
BASFC
"
)
@Table
(
name
=
"T_ICLEAR_API_
MAWB
"
)
@DynamicInsert
@DynamicUpdate
@Data
...
...
@@ -86,9 +86,9 @@ public class Basfc implements Serializable {
@Column
(
name
=
"OPERATESCC"
)
private
String
operateSCC
;
@ApiModelProperty
(
value
=
"
EANNo"
,
name
=
"EAN
No"
)
@ApiModelProperty
(
value
=
"
eanNo"
,
name
=
"ean
No"
)
@Column
(
name
=
"EANNO"
)
private
String
EAN
No
;
private
String
ean
No
;
@Valid
@ApiModelProperty
(
value
=
"运单明细"
,
name
=
"consignmentList"
,
example
=
""
)
...
...
src/main/java/com/erry/iclear/dateInterface/entity/ChmConsignment.java
View file @
841d9a4
...
...
@@ -400,6 +400,12 @@ public class ChmConsignment implements Serializable {
@Column
(
name
=
"PORT_NAME"
)
private
String
portName
;
/**
* EANNO
*/
@Column
(
name
=
"EANNO"
)
private
String
eanNo
;
@OneToMany
(
mappedBy
=
"chmConsignment"
,
cascade
=
CascadeType
.
ALL
)
private
List
<
ChmConsignmentDetail
>
chmConsignmentDetailList
;
...
...
src/main/java/com/erry/iclear/dateInterface/service/BasfService.java
View file @
841d9a4
...
...
@@ -74,7 +74,7 @@ public class BasfService {
//发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型
basfMawb
.
setTradeCodeScc
(
basfc
.
getShipperSCC
());
basfMawb
.
setE
ANNo
(
basfc
.
getEAN
No
());
basfMawb
.
setE
anNo
(
basfc
.
getEan
No
());
//明细
List
<
BasfMawbDetail
>
mawbDetailList
=
new
ArrayList
<>();
if
(
basfc
.
getConsignmentList
().
size
()>
0
){
...
...
src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentService.java
View file @
841d9a4
...
...
@@ -269,6 +269,8 @@ public class ChmConsignmentService {
result
.
setOwnerCode
(
mawb
.
getOwnerCode
());
//经营单位社会信用证代码
result
.
setOwnerCodeScc
(
mawb
.
getOwnerCodeScc
());
//EANNO
result
.
setEanNo
(
mawb
.
getEanNo
());
/*//TODO 生产核销单位统一信用代码---报关形式类型
result.setTradeCoSCC(mawb.getTradeCodeScc());
...
...
Please
register
or
login
to post a comment