Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
4b59539f
Commit
4b59539f
authored
Jun 16, 2020
by
蒋勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
9cf7636e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
ic-deliver/app/base/db/metadata/app/platform.js
+0
-0
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
+7
-3
No files found.
ic-deliver/app/base/db/metadata/app/platform.js
View file @
4b59539f
This diff is collapsed.
Click to expand it.
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
View file @
4b59539f
...
...
@@ -10,16 +10,20 @@ class DeliverybillService extends ServiceBase {
var
self
=
this
return
this
.
db
.
transaction
(
async
function
(
t
){
//先按照ids查询出交付单的合计服务成本
let
settleAmount
=
await
self
.
dao
.
model
.
findSum
(
"cost_price"
,{
where
:{
[
self
.
db
.
Op
.
In
]:
ids
},
transaction
:
t
})
let
settleAmount
=
await
self
.
dao
.
model
.
findSum
(
"cost_price"
,{
where
:{
id
:{[
self
.
db
.
Op
.
In
]:
ids
}
},
transaction
:
t
})
let
settlecode
=
await
self
.
getBusUid
(
"JSD"
)
let
settleObj
=
{
code
:
settlecode
,
settle_amount
:
settleAmount
,
}
//生成结算单,结算单状态为待审核
await
self
.
db
.
models
.
settlebill
.
create
(
settleObj
,{
transaction
:
t
})
let
newentity
=
await
self
.
db
.
models
.
settlebill
.
create
(
settleObj
,{
transaction
:
t
})
//然后按照ids更新交付单的状态为结算中,更新结算单的id到交付单表
await
self
.
updateByWhere
({
'settle_status'
:
'settling'
,
'settlebill_id'
:
newentity
.
id
},{
id
:{[
self
.
db
.
Op
.
In
]:
ids
}},
t
)
return
newentity
});
}
async
findAndCountAll
(
obj
)
{
...
...
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