Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
100c0bb6
Commit
100c0bb6
authored
Apr 29, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-04-29 修补单位为空的BUG
parent
080dfd51
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
MakeBillOfLadingServiceImpl.java
...service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
+11
-5
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @
100c0bb6
...
@@ -444,11 +444,17 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
...
@@ -444,11 +444,17 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
// }
// }
paramMap
.
put
(
"seaFreight"
,
item
.
getOneSeaFreight
()
+
currencyMap
.
get
(
item
.
getSeaFreightCurrency
())
+
"/m³"
);
paramMap
.
put
(
"seaFreight"
,
item
.
getOneSeaFreight
()
+
currencyMap
.
get
(
item
.
getSeaFreightCurrency
())
+
"/m³"
);
if
(
item
.
getOneClearanceFreight
().
compareTo
(
BigDecimal
.
ZERO
)
==
0
)
{
if
(
item
.
getOneClearanceFreight
().
compareTo
(
BigDecimal
.
ZERO
)
==
0
)
{
paramMap
.
put
(
"clearanceFreight"
,
"0"
+
currencyMap
.
get
(
item
.
getClearanceFreightCurrency
())
+
"/m³"
);
if
(
item
.
getClearanceFreightCurrency
()
==
null
)
{
paramMap
.
put
(
"clearanceFreight"
,
"0"
);
}
else
{
paramMap
.
put
(
"clearanceFreight"
,
"0"
+
currencyMap
.
get
(
item
.
getClearanceFreightCurrency
())
+
"/m³"
);
//paramMap.put("clearanceFreight", "");
//paramMap.put("clearanceFreight", "");
//lanbm 2024-04-25 update 提单制作,清关价为0问题修改
//lanbm 2024-04-25 update 提单制作,清关价为0问题修改
}
}
else
{
}
else
{
paramMap
.
put
(
"clearanceFreight"
,
item
.
getOneClearanceFreight
()
+
currencyMap
.
get
(
item
.
getClearanceFreightCurrency
())
+
"/m³"
);
paramMap
.
put
(
"clearanceFreight"
,
item
.
getOneClearanceFreight
()
+
currencyMap
.
get
(
item
.
getClearanceFreightCurrency
())
+
"/m³"
);
}
}
return
paramMap
;
return
paramMap
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
...
@@ -750,7 +756,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
...
@@ -750,7 +756,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
}
}
if
(
makeBillOfLadingListBackVO
.
getDraweeCode
()
==
1
)
{
if
(
makeBillOfLadingListBackVO
.
getDraweeCode
()
==
1
)
{
makeBillOfLadingListBackVO
.
setDrawee
(
"付款人=发货人"
);
makeBillOfLadingListBackVO
.
setDrawee
(
"付款人=发货人"
);
}
else
if
(
makeBillOfLadingListBackVO
.
getDraweeCode
()
==
3
)
{
}
else
if
(
makeBillOfLadingListBackVO
.
getDraweeCode
()
==
3
)
{
makeBillOfLadingListBackVO
.
setDrawee
(
"付款人=自定义"
);
makeBillOfLadingListBackVO
.
setDrawee
(
"付款人=自定义"
);
}
}
// List typeList = new ArrayList();
// List typeList = new ArrayList();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment