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
bcf1787a
Commit
bcf1787a
authored
Nov 12, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
费用修改申请审批通过后未更新应收单的bug修复
parent
04f924c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
20241112.sql
sql/v2.1/20241112.sql
+5
-1
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+8
-0
No files found.
sql/v2.1/20241112.sql
View file @
bcf1787a
-- 补充入仓记录出货添加新品名字段
alter
table
ecw_order_warehouse_in
add
COLUMN
`is_shipment_new_in`
bit
(
1
)
DEFAULT
0
COMMENT
'出货后新添加的商品'
;
\ No newline at end of file
add
COLUMN
`is_shipment_new_in`
bit
(
1
)
DEFAULT
0
COMMENT
'出货后新添加的商品'
;
-- 修改费用申请记录表批量审批流程id字段类型
alter
table
ecw_order_fee_application
modify
COLUMN
`batch_bpm_business_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'批量费用审核时流程ID'
;
\ No newline at end of file
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @
bcf1787a
...
...
@@ -393,6 +393,10 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
List
<
FeeDto
>
feeDtos
=
new
ArrayList
<>();
if
(
result
==
2
)
{
// 审批通过,更新状态与修改后的数据到数据库
if
(
Objects
.
nonNull
(
orderFeeApplicationDO
.
getId
())){
OrderFeeApplicationDO
orgFeeApplicationDO
=
feeApplicationMapper
.
selectById
(
orderFeeApplicationDO
.
getId
());
orderFeeApplicationDO
.
setReceivableId
(
orgFeeApplicationDO
.
getReceivableId
());
}
orderFeeApplicationDO
.
setStatus
(
result
);
feeApplicationMapper
.
updateById
(
orderFeeApplicationDO
);
OrderBackVO
order
=
orderQueryService
.
getOrder
(
orderFeeApplicationDO
.
getOrderId
());
...
...
@@ -507,6 +511,10 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
batchFeeList
=
this
.
list
(
lambdaQueryWrapper
);
}
for
(
OrderFeeApplicationDO
feeApplicationDO
:
batchFeeList
)
{
if
(
Objects
.
nonNull
(
feeApplicationDO
.
getId
())){
OrderFeeApplicationDO
orgFeeApplicationDO
=
feeApplicationMapper
.
selectById
(
feeApplicationDO
.
getId
());
feeApplicationDO
.
setReceivableId
(
orgFeeApplicationDO
.
getReceivableId
());
}
//生成应收
DictDataRespDTO
dictDto
=
DictFrameworkUtils
.
getDictDataFromCache
(
"receivable_fee_type"
,
String
.
valueOf
(
feeApplicationDO
.
getFeeType
()));
if
(
feeApplicationDO
.
getReceivableId
()
!=
null
&&
feeApplicationDO
.
getReceivableId
()
>
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