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
fe0341fc
Commit
fe0341fc
authored
Aug 24, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 交付支持重复推
parent
13a71025
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+8
-2
No files found.
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
fe0341fc
...
@@ -699,8 +699,14 @@ class DeliverybillCtl extends CtlBase {
...
@@ -699,8 +699,14 @@ class DeliverybillCtl extends CtlBase {
try
{
try
{
var
res
=
await
this
.
service
.
findInfoByDeliverCode
(
pobj
);
var
res
=
await
this
.
service
.
findInfoByDeliverCode
(
pobj
);
if
(
res
)
{
if
(
res
)
{
if
(
res
.
delivery_status
!=
'received'
&&
res
.
delivery_status
!=
'userUploadWait'
)
{
//如果数据库中状态是已接单、待用户上传,说明是第一次提交文件,状态为传过了的状态;如果不是已接单、待用户上传,说明是客户驳回后重新提交的文件,状态改为已驳回
if
([
"received"
,
"userUploadWait"
].
includes
(
res
.
delivery_status
))
{
pobj
.
deliverStatus
=
"userConfirmationReject"
;
//状态改成驳回,
// 已接单、待用户上传 , 第一次 上传 文件
pobj
.
deliverStatus
=
"collecting"
;
}
else
if
([
"userConfirmationWait"
].
includes
(
res
.
delivery_status
))
{
// 递交文件待确认 , 驳回后重新提交文件
pobj
.
deliverStatus
=
"userConfirmationReject"
;
}
else
{
pobj
.
deliverStatus
=
res
.
delivery_status
;
}
}
await
this
.
service
.
updateInfoByDeliverCode
(
pobj
);
await
this
.
service
.
updateInfoByDeliverCode
(
pobj
);
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
...
...
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