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
c76f6f59
Commit
c76f6f59
authored
Jan 07, 2025
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提单编辑列表过滤未入仓的产品信息
parent
85c95eeb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
MakeBillOfLadingServiceImpl.java
...service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
+1
-1
BoxPreloadGoodsBackVO.java
...le/shipment/vo/boxPreloadGoods/BoxPreloadGoodsBackVO.java
+1
-1
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @
c76f6f59
...
...
@@ -844,7 +844,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
makeBillOfLadingListBackVO
.
setOrderStatusString
(
firstBoxPreloadGoodsBackVO
.
getStatusMsg
());
// 首次入仓时间
makeBillOfLadingListBackVO
.
setRucangTime
(
firstBoxPreloadGoodsBackVO
.
getRucangTime
());
makeBillOfLadingListBackVO
.
setOrderItemList
(
orderGoodsItemList
);
makeBillOfLadingListBackVO
.
setOrderItemList
(
orderGoodsItemList
.
stream
().
filter
(
item
->
Objects
.
nonNull
(
item
.
getWarehouseInInfo
())
&&
item
.
getWarehouseInInfoVO
().
getCartonsNum
()
>
0
).
collect
(
Collectors
.
toList
())
);
makeBillOfLadingListBackVO
.
setTidanNo
(
firstBoxPreloadGoodsBackVO
.
getTidanNum
());
String
customsTypeName
=
""
;
if
(
makeBillOfLadingListBackVO
.
getCustomsType
()
==
2
)
{
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxPreloadGoodsBackVO.java
View file @
c76f6f59
...
...
@@ -193,7 +193,7 @@ public class BoxPreloadGoodsBackVO {
@ApiModelProperty
(
value
=
"合包箱号"
)
private
String
pkgNum
;
p
rivate
WarehouseInInfoVO
getWarehouseInInfoVO
()
{
p
ublic
WarehouseInInfoVO
getWarehouseInInfoVO
()
{
if
(
warehouseInInfoVO
!=
null
)
return
warehouseInInfoVO
;
if
(
StringUtils
.
isNotEmpty
(
this
.
warehouseInInfo
))
{
warehouseInInfoVO
=
JSONObject
.
parseObject
(
this
.
warehouseInInfo
,
...
...
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