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
30f81b35
Commit
30f81b35
authored
Mar 20, 2025
by
honghy
Committed by
wux
Mar 21, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug335 NG2419441L显示放货数量不对
parent
929eff4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
OrderCargoControlPickMapper.java
...ql/orderCargoControlPick/OrderCargoControlPickMapper.java
+12
-0
OrderCargoControlPickServiceImpl.java
...derCargoControlPick/OrderCargoControlPickServiceImpl.java
+1
-5
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControlPick/OrderCargoControlPickMapper.java
View file @
30f81b35
...
@@ -178,4 +178,16 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
...
@@ -178,4 +178,16 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
* 查询控货订单列表统计
* 查询控货订单列表统计
*/
*/
StatisticsOrderVO
statisticsOrderControl
(
@Param
(
"query"
)
OrderQueryVO
query
);
StatisticsOrderVO
statisticsOrderControl
(
@Param
(
"query"
)
OrderQueryVO
query
);
@Select
({
"<script>"
,
"SELECT ifnull(sum(pick_num),0) pick_num"
,
"FROM ecw_order_cargo_control_pick"
,
"WHERE order_id = #{orderId}"
,
"AND pick_num > 0"
,
"AND `status` in (1, 2, 3, 4, 5, 6)"
,
"AND deleted = 0"
,
"</script>"
})
Long
selectSumByOrderId
(
@Param
(
"orderId"
)
Long
orderId
);
}
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickServiceImpl.java
View file @
30f81b35
...
@@ -1194,11 +1194,7 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
...
@@ -1194,11 +1194,7 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
orderCargoControlPickDO
.
setStatus
(
0
);
orderCargoControlPickDO
.
setStatus
(
0
);
orderCargoControlPickMapper
.
updateById
(
orderCargoControlPickDO
);
orderCargoControlPickMapper
.
updateById
(
orderCargoControlPickDO
);
// TODO 需要处理取消后,订单没有放货记录,订单中控货状态是否改变
// TODO 需要处理取消后,订单没有放货记录,订单中控货状态是否改变
Long
count
=
orderCargoControlPickMapper
.
selectCount
(
new
LambdaQueryWrapper
<
OrderCargoControlPickDO
>()
Long
count
=
orderCargoControlPickMapper
.
selectSumByOrderId
(
orderCargoControlPickDO
.
getOrderId
());
.
eq
(
OrderCargoControlPickDO:
:
getOrderId
,
orderCargoControlPickDO
.
getOrderId
())
.
in
(
OrderCargoControlPickDO:
:
getStatus
,
1
,
2
,
3
,
4
,
5
,
6
)
.
gt
(
OrderCargoControlPickDO:
:
getPickNum
,
0
)
.
eq
(
OrderCargoControlPickDO:
:
getDeleted
,
false
));
String
msg
=
""
;
String
msg
=
""
;
// 避免并发修改,这里只对订单的控货状态进行修改
// 避免并发修改,这里只对订单的控货状态进行修改
if
(
count
==
0
)
{
if
(
count
==
0
)
{
...
...
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