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
d0d2619a
Commit
d0d2619a
authored
Oct 09, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
已预装未提交预装审核的订单补充出货状态更新冗余
parent
919da54c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
BoxPreloadGoodsServiceImpl.java
...t/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
+8
-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 @
d0d2619a
...
...
@@ -355,7 +355,6 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
}
preloadGoodsDOList
.
add
(
boxPreloadGoods
);
}
// 插入
boxPreloadGoodsMapper
.
insertBatch
(
preloadGoodsDOList
);
...
...
@@ -363,6 +362,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
//修改为预装中
boxDO
.
setPrStatus
(
PrStatusEnum
.
PRELOAD_ING
.
getPrStatus
());
boxService
.
updateById
(
boxDO
);
for
(
Long
oId
:
orderIdList
)
{
boxService
.
updateOrderStatus
(
oId
,
null
,
null
,
BoxStatusEnum
.
PREINSTALLING
.
getStatus
(),
null
,
null
,
Boolean
.
FALSE
);
}
boxService
.
addOrderLog
(
orderIdList
,
OrderShipmentLog
.
PRELOAD_ADD
,
""
);
}
else
if
(
boxDO
.
getPrStatus
()
==
PrStatusEnum
.
PRELOAD_APPROVAL_SUCCESS
.
getPrStatus
())
{
//补单。修改订单状态
...
...
@@ -370,12 +373,14 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
boxService
.
updateOrderStatus
(
oId
,
OrderStatusEnum
.
PRE_INSTALLED
.
getValue
(),
0
,
BoxStatusEnum
.
PREINSTALL_EXAMINE_SUCCESS
.
getStatus
(),
null
,
null
,
Boolean
.
FALSE
);
}
//生成提单号
boxService
.
generateBillLadingNo
(
shipmentId
,
false
,
false
);
boxService
.
addOrderLog
(
orderIdList
,
OrderShipmentLog
.
CABINET_PATCH
,
""
);
}
else
{
for
(
Long
oId
:
orderIdList
)
{
boxService
.
updateOrderStatus
(
oId
,
null
,
null
,
BoxStatusEnum
.
PREINSTALLING
.
getStatus
(),
null
,
null
,
Boolean
.
FALSE
);
}
boxService
.
addOrderLog
(
orderIdList
,
OrderShipmentLog
.
PRELOAD_ADD
,
""
);
}
...
...
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