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
73dd431f
Commit
73dd431f
authored
Sep 10, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入仓动态业务时间逻辑修改,移除预装导致订单重新入仓时不再对订单动态业务时间进行重置
parent
f2af5d64
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+4
-2
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
73dd431f
...
...
@@ -3799,6 +3799,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if
(
Objects
.
equals
(
OrderStatusEnum
.
IN_WAREHOUSE
.
getValue
(),
status
))
{
// 每次更新已入仓状态的同时,刷新入仓动态
Long
timeId
=
null
;
Date
businessTime
=
null
;
currentOrderDO
.
setLastTimeTotalNum
(
0
);
if
(
Objects
.
nonNull
(
hasExit
)
&&
hasExit
==
1
)
{
// 部分退场入仓
...
...
@@ -3814,14 +3815,15 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if
(
CollectionUtil
.
isNotEmpty
(
orderTimeDOS
)
&&
orderTimeDOS
.
size
()
>
0
)
{
OrderTimeDO
timeDO
=
orderTimeDOS
.
get
(
0
);
timeId
=
timeDO
.
getId
();
businessTime
=
timeDO
.
getBusinessTime
();
currentOrderDO
.
setLastTimeTotalNum
(
timeDO
.
getTotalNum
());
}
if
(
Objects
.
equals
(
currentOrderDO
.
getTransportId
(),
TransportTypeShortEnum
.
AIR_FREIGHT_LINE
.
getValue
()))
{
orderBusinessService
.
addAirOrderTimeLog
(
currentOrderDO
,
OrderAirTimeEnum
.
AIR_IN_WAREHOUSE
,
null
,
null
,
null
,
null
,
null
,
timeId
);
orderBusinessService
.
addAirOrderTimeLog
(
currentOrderDO
,
OrderAirTimeEnum
.
AIR_IN_WAREHOUSE
,
null
,
null
,
null
,
businessTime
,
null
,
timeId
);
}
else
if
(
Objects
.
equals
(
currentOrderDO
.
getTransportId
(),
TransportTypeShortEnum
.
SEA_CONTAINER
.
getValue
()))
{
if
(
currentOrderDO
.
getLastTimeTotalNum
()
!=
currentOrderDO
.
getSumNum
())
{
// 当有入仓箱数变化时才做动态更新
orderBusinessService
.
addSeaOrderTimeLog
(
currentOrderDO
,
OrderSeaTimeEnum
.
SEA_IN_WAREHOUSE
,
null
,
null
,
null
,
null
,
null
,
timeId
);
orderBusinessService
.
addSeaOrderTimeLog
(
currentOrderDO
,
OrderSeaTimeEnum
.
SEA_IN_WAREHOUSE
,
null
,
null
,
null
,
businessTime
,
null
,
timeId
);
}
}
}
...
...
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