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
e203f205
Commit
e203f205
authored
Dec 20, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
待预装订单列表查询bug修复
parent
e08680a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
BoxPreloadGoodsServiceImpl.java
...t/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
+3
-3
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
View file @
e203f205
...
...
@@ -2848,9 +2848,9 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
if
(
StringUtils
.
isNotBlank
(
orderPreloadVO
.
getGuanLianOrderStatus
()))
{
List
<
GuanLianOrderStatusVO
>
guanLianOrderStatusVOList
=
JSONObject
.
parseArray
(
orderPreloadVO
.
getGuanLianOrderStatus
(),
GuanLianOrderStatusVO
.
class
);
if
(
CollectionUtil
.
isNotEmpty
(
guanLianOrderStatusVOList
)
&&
guanLianOrderStatusVOList
.
size
()
>
0
)
{
List
<
GuanLianOrderStatusVO
>
approvalGuanLianOrderList
=
guanLianOrderStatusVOList
.
stream
().
filter
(
vo
->
vo
.
getType
()
==
2
).
collect
(
Collectors
.
toList
());
if
(
CollectionUtil
.
isNotEmpty
(
approvalGuanLianOrder
List
))
{
boolean
isApproval
=
approvalGuanLianOrder
List
.
stream
().
anyMatch
(
o
->
{
//
List<GuanLianOrderStatusVO> approvalGuanLianOrderList = guanLianOrderStatusVOList.stream().filter(vo -> vo.getType() == 2).collect(Collectors.toList());
if
(
CollectionUtil
.
isNotEmpty
(
guanLianOrderStatusVO
List
))
{
boolean
isApproval
=
guanLianOrderStatusVO
List
.
stream
().
anyMatch
(
o
->
{
if
(
o
.
getType
()
==
2
)
{
// 关联单进行中的审批类型校验
OrderApprovalTypeCheckEvent
guanLianApprovalTypeCheckEvent
=
new
OrderApprovalTypeCheckEvent
(
o
.
getOrderId
(),
null
,
null
,
Arrays
.
asList
(
6
,
11
,
13
,
14
,
22
,
23
),
false
);
...
...
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