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
3fe54f92
Commit
3fe54f92
authored
Apr 12, 2021
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改备注
parent
3a249e31
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
center-order/app/base/service/impl/dbneed/needsolutionSve.js
+4
-4
center-order/app/base/service/impl/qcutils/aliyunqcSve.js
+4
-4
center-order/app/base/service/impl/qcutils/baiduqcSve.js
+1
-1
center-order/app/base/service/impl/qcutils/baseqcSve.js
+2
-2
center-order/app/base/service/impl/qcutils/ncSve.js
+1
-1
center-order/app/base/service/impl/qcutils/regCenterOrderSve.js
+1
-1
No files found.
center-order/app/base/service/impl/dbneed/needsolutionSve.js
View file @
3fe54f92
...
...
@@ -392,7 +392,7 @@ class NeedsolutionService extends ServiceBase {
return
system
.
getResultFail
(
-
105
,
"该方案需求状态为"
+
needinfo
.
statusName
+
",不能执行此操作"
);
}
if
(
ns
.
status
!=
"dqr"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,只能废弃待确认方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,只能废弃待确认方案
-1
"
);
}
await
this
.
dao
.
update
({
id
:
ns
.
id
,
status
:
"yzf"
});
//方案废弃
//获取方案信息
...
...
@@ -428,7 +428,7 @@ class NeedsolutionService extends ServiceBase {
for
(
var
i
=
0
;
i
<
ns
.
length
;
i
++
)
{
var
fa
=
ns
[
i
];
if
(
fa
.
status
==
"ywc"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案
-1
"
);
}
}
await
this
.
dao
.
model
.
update
({
status
:
"yzf"
,
isInvalid
:
1
},
{
where
:
{
needNo
:
needinfo
.
needNo
}
});
//方案废弃
...
...
@@ -990,7 +990,7 @@ class NeedsolutionService extends ServiceBase {
return
system
.
getResultFail
(
-
105
,
"该方案需求状态为"
+
needinfo
.
statusName
+
",不能执行此操作"
);
}
if
(
ns
.
status
!=
"dqr"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,只能废弃待确认方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,只能废弃待确认方案
-2
"
);
}
var
solutionContent
=
ns
.
solutionContent
;
if
(
!
solutionContent
.
status
||
[
"USER_UPLOADED"
,
"MATERIAL_UNCONFIRM"
,
"USER_CONFIRMED"
,
"ACCOUNT_REGISTERED"
,
"MATERIAL_SUBMITTED"
].
indexOf
(
solutionContent
.
status
)
<
0
)
{
...
...
@@ -1035,7 +1035,7 @@ class NeedsolutionService extends ServiceBase {
return
system
.
getResultFail
(
-
105
,
"该方案需求状态为"
+
needinfo
.
statusName
+
",不能执行此操作"
);
}
if
(
ns
.
status
!=
"dqr"
&&
ns
.
status
!=
"yzf"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能作废已完成方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能作废已完成方案
-1
"
);
}
var
solutionContent
=
ns
.
solutionContent
;
//方案流程列表
...
...
center-order/app/base/service/impl/qcutils/aliyunqcSve.js
View file @
3fe54f92
...
...
@@ -97,7 +97,7 @@ class AliyunQcService {
});
if
(
ns
&&
ns
.
id
)
{
if
(
ns
.
status
==
"ywc"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案
-3
"
);
}
var
flowStatus
=
ns
.
solutionContent
&&
ns
.
solutionContent
.
status
?
ns
.
solutionContent
.
status
:
""
;
if
(
flowStatus
&&
[
"GXB_REFUSE"
,
"CLOSE"
].
indexOf
(
flowStatus
)
<
0
)
{
...
...
@@ -370,7 +370,7 @@ class AliyunQcService {
// }
var
solutionContent
=
ns
.
solutionContent
;
if
(
!
solutionContent
.
status
||
[
"USER_UPLOADED"
,
"MATERIAL_UNCONFIRM"
,
"USER_CONFIRMED"
,
"ACCOUNT_REGISTERED"
,
"MATERIAL_SUBMITTED"
].
indexOf
(
solutionContent
.
status
)
<
0
)
{
return
system
.
getResultFail
(
-
302
,
"方案流程状态错误,不能执行此操作"
);
return
system
.
getResultFail
(
-
302
,
"方案流程状态错误,不能执行此操作
-1
"
);
}
solutionContent
.
serviceProviderNote
=
ab
.
Note
;
var
solutionFlowList
=
solutionContent
.
solutionFlowList
||
[];
...
...
@@ -733,7 +733,7 @@ class AliyunQcService {
solutionContent
.
status
=
"CLOSE"
;
solutionContent
.
statusName
=
this
.
icpSolutionStatusReference
.
CLOSE
;
}
else
{
return
system
.
getResultFail
(
-
110
,
"状态错误"
);
return
system
.
getResultFail
(
-
110
,
"状态错误
-2
"
);
}
solutionContent
.
solutionFlowList
=
solutionFlowList
;
...
...
@@ -1078,7 +1078,7 @@ class AliyunQcService {
solutionContent
.
status
=
"ABC_CLOSE_PRODUCE"
;
solutionContent
.
statusName
=
this
.
ediSolutionStatusReference
.
ABC_CLOSE_PRODUCE
;
}
else
{
return
system
.
getResultFail
(
-
110
,
"状态错误"
);
return
system
.
getResultFail
(
-
110
,
"状态错误
-3
"
);
}
solutionContent
.
solutionFlowList
=
solutionFlowList
;
...
...
center-order/app/base/service/impl/qcutils/baiduqcSve.js
View file @
3fe54f92
...
...
@@ -152,7 +152,7 @@ class BaiduQcService {
solutionContent
.
status
=
"CLOSE"
;
solutionContent
.
statusName
=
this
.
icpSolutionStatusReference
.
CLOSE
;
}
else
{
return
system
.
getResultFail
(
-
110
,
"状态错误"
);
return
system
.
getResultFail
(
-
110
,
"状态错误
-4
"
);
}
solutionContent
.
solutionFlowList
=
solutionFlowList
;
...
...
center-order/app/base/service/impl/qcutils/baseqcSve.js
View file @
3fe54f92
...
...
@@ -85,7 +85,7 @@ class BaseQcService {
if
(
ns
&&
ns
.
id
)
{
if
(
ns
.
status
==
"ywc"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案
-2
"
);
}
var
flowStatus
=
ns
.
solutionContent
&&
ns
.
solutionContent
.
status
?
ns
.
solutionContent
.
status
:
""
;
if
(
flowStatus
&&
[
...
...
@@ -1130,7 +1130,7 @@ class BaseQcService {
solutionContent
.
status
=
"ABC_CLOSE_PRODUCE"
;
solutionContent
.
statusName
=
this
.
ediSolutionStatusReference
.
ABC_CLOSE_PRODUCE
;
}
else
{
return
system
.
getResultFail
(
-
110
,
"状态错误"
);
return
system
.
getResultFail
(
-
110
,
"状态错误
-1
"
);
}
solutionContent
.
solutionFlowList
=
solutionFlowList
;
...
...
center-order/app/base/service/impl/qcutils/ncSve.js
View file @
3fe54f92
...
...
@@ -576,7 +576,7 @@ class NcService {
// var newFlowStatus = [];
if
(
ns
&&
ns
.
id
)
{
if
(
ns
.
status
==
"ywc"
)
{
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案"
);
return
system
.
getResultFail
(
-
103
,
"方案状态错误,不能废弃已完成方案
-4
"
);
}
var
flowStatus
=
ns
.
solutionContent
&&
ns
.
solutionContent
.
status
?
ns
.
solutionContent
.
status
:
""
;
if
(
flowStatus
&&
[
"NOT_ACCEPTED"
,
"CLOSE"
].
indexOf
(
flowStatus
)
<
0
)
{
...
...
center-order/app/base/service/impl/qcutils/regCenterOrderSve.js
View file @
3fe54f92
...
...
@@ -338,7 +338,7 @@ class RegCenterOrderService{
solutionContent
.
status
=
"CLOSE"
;
solutionContent
.
statusName
=
this
.
regSolutionStatus
.
CLOSE
;
}
else
{
return
system
.
getResultFail
(
-
110
,
"状态错误"
);
return
system
.
getResultFail
(
-
110
,
"状态错误
-5
"
);
}
solutionContent
.
solutionFlowList
=
solutionFlowList
;
...
...
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