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
64c1254a
Commit
64c1254a
authored
Jan 08, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug162 预装页面,调仓订单数据显示和统计问题
parent
8446e828
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
BoxPreloadGoodsServiceImpl.java
...t/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
+20
-1
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
View file @
64c1254a
...
...
@@ -1128,8 +1128,27 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
//预装,查询的要过滤装柜里面补单的
// query.setIsCover(0);
query
.
setIsRemove
(
0
);
//校验始发仓
Long
startWarehouseId
=
query
.
getStartWarehouseId
();
if
(
startWarehouseId
!=
null
)
{
query
.
setStartWarehouseId
(
null
);
}
List
<
BoxPreloadGoodsBackVO
>
goodsItemList
=
boxPreloadGoodsMapper
.
orderPreloaded
(
query
);
if
(
startWarehouseId
!=
null
)
{
query
.
setStartWarehouseId
(
null
);
Iterator
<
BoxPreloadGoodsBackVO
>
it
=
goodsItemList
.
iterator
();
while
(
it
.
hasNext
())
{
BoxPreloadGoodsBackVO
preloadVO
=
it
.
next
();
Long
adjustToDestWarehouseId
=
preloadVO
.
getAdjustToDestWarehouseId
();
if
(
adjustToDestWarehouseId
!=
null
&&
adjustToDestWarehouseId
!=
0
)
{
//有调仓,判断调仓是否符合条件,不符合条件则直接移除
if
(!
startWarehouseId
.
equals
(
adjustToDestWarehouseId
))
it
.
remove
();
}
else
{
//没有调仓,判断始发仓是否符合条件
if
(!
startWarehouseId
.
equals
(
preloadVO
.
getStartWarehouseId
()))
it
.
remove
();
}
}
}
Map
<
Long
,
List
<
BoxPreloadGoodsBackVO
>>
sectionGoodsMap
=
goodsItemList
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
BoxPreloadGoodsBackVO:
:
getSecId
));
...
...
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