Skip to content

Z
zhichan
Commit 3fe54f92 by 宋毅
Options

修改备注

parent 3a249e31
Showing with 13 additions and 13 deletions
center-order/app/base/service/impl/dbneed/needsolutionSve.js
...@@ -392,7 +392,7 @@ class NeedsolutionService extends ServiceBase { ...@@ -392,7 +392,7 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作"); return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
} }
if (ns.status != "dqr") { if (ns.status != "dqr") {
return system.getResultFail(-103, "方案状态错误，只能废弃待确认方案"); return system.getResultFail(-103, "方案状态错误，只能废弃待确认方案-1");
} }
await this.dao.update({ id: ns.id, status: "yzf" });//方案废弃 await this.dao.update({ id: ns.id, status: "yzf" });//方案废弃
//获取方案信息 //获取方案信息
...@@ -428,7 +428,7 @@ class NeedsolutionService extends ServiceBase { ...@@ -428,7 +428,7 @@ class NeedsolutionService extends ServiceBase {
for (var i = 0; i < ns.length; i++) { for (var i = 0; i < ns.length; i++) {
var fa = ns[i]; var fa = ns[i];
if (fa.status == "ywc") { 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 } });//方案废弃 await this.dao.model.update({ status: "yzf",isInvalid:1 }, { where: { needNo: needinfo.needNo } });//方案废弃
...@@ -990,7 +990,7 @@ class NeedsolutionService extends ServiceBase { ...@@ -990,7 +990,7 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作"); return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
} }
if (ns.status != "dqr") { if (ns.status != "dqr") {
return system.getResultFail(-103, "方案状态错误，只能废弃待确认方案"); return system.getResultFail(-103, "方案状态错误，只能废弃待确认方案-2");
} }
var solutionContent = ns.solutionContent; var solutionContent = ns.solutionContent;
if (!solutionContent.status || ["USER_UPLOADED", "MATERIAL_UNCONFIRM", "USER_CONFIRMED", "ACCOUNT_REGISTERED", "MATERIAL_SUBMITTED"].indexOf(solutionContent.status) < 0) { 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 { ...@@ -1035,7 +1035,7 @@ class NeedsolutionService extends ServiceBase {
return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作"); return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
} }
if (ns.status != "dqr" && ns.status != "yzf") { if (ns.status != "dqr" && ns.status != "yzf") {
return system.getResultFail(-103, "方案状态错误，不能作废已完成方案"); return system.getResultFail(-103, "方案状态错误，不能作废已完成方案-1");
} }
var solutionContent = ns.solutionContent; var solutionContent = ns.solutionContent;
//方案流程列表 //方案流程列表
......
center-order/app/base/service/impl/qcutils/aliyunqcSve.js
...@@ -97,7 +97,7 @@ class AliyunQcService { ...@@ -97,7 +97,7 @@ class AliyunQcService {
}); });
if (ns && ns.id) { if (ns && ns.id) {
if (ns.status == "ywc") { if (ns.status == "ywc") {
return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案"); return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案-3");
} }
var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : ""; var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : "";
if (flowStatus && ["GXB_REFUSE", "CLOSE"].indexOf(flowStatus) < 0) { if (flowStatus && ["GXB_REFUSE", "CLOSE"].indexOf(flowStatus) < 0) {
...@@ -370,7 +370,7 @@ class AliyunQcService { ...@@ -370,7 +370,7 @@ class AliyunQcService {
// } // }
var solutionContent = ns.solutionContent; var solutionContent = ns.solutionContent;
if (!solutionContent.status || ["USER_UPLOADED", "MATERIAL_UNCONFIRM", "USER_CONFIRMED", "ACCOUNT_REGISTERED", "MATERIAL_SUBMITTED"].indexOf(solutionContent.status) < 0) { 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; solutionContent.serviceProviderNote = ab.Note;
var solutionFlowList = solutionContent.solutionFlowList || []; var solutionFlowList = solutionContent.solutionFlowList || [];
...@@ -733,7 +733,7 @@ class AliyunQcService { ...@@ -733,7 +733,7 @@ class AliyunQcService {
solutionContent.status = "CLOSE"; solutionContent.status = "CLOSE";
solutionContent.statusName = this.icpSolutionStatusReference.CLOSE; solutionContent.statusName = this.icpSolutionStatusReference.CLOSE;
} else { } else {
return system.getResultFail(-110, "状态错误"); return system.getResultFail(-110, "状态错误-2");
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
...@@ -1078,7 +1078,7 @@ class AliyunQcService { ...@@ -1078,7 +1078,7 @@ class AliyunQcService {
solutionContent.status = "ABC_CLOSE_PRODUCE"; solutionContent.status = "ABC_CLOSE_PRODUCE";
solutionContent.statusName = this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE; solutionContent.statusName = this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE;
} else { } else {
return system.getResultFail(-110, "状态错误"); return system.getResultFail(-110, "状态错误-3");
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
......
center-order/app/base/service/impl/qcutils/baiduqcSve.js
...@@ -152,7 +152,7 @@ class BaiduQcService { ...@@ -152,7 +152,7 @@ class BaiduQcService {
solutionContent.status = "CLOSE"; solutionContent.status = "CLOSE";
solutionContent.statusName = this.icpSolutionStatusReference.CLOSE; solutionContent.statusName = this.icpSolutionStatusReference.CLOSE;
} else { } else {
return system.getResultFail(-110, "状态错误"); return system.getResultFail(-110, "状态错误-4");
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
......
center-order/app/base/service/impl/qcutils/baseqcSve.js
...@@ -85,7 +85,7 @@ class BaseQcService { ...@@ -85,7 +85,7 @@ class BaseQcService {
if (ns && ns.id) { if (ns && ns.id) {
if (ns.status == "ywc") { if (ns.status == "ywc") {
return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案"); return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案-2");
} }
var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : ""; var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : "";
if (flowStatus && [ if (flowStatus && [
...@@ -1130,7 +1130,7 @@ class BaseQcService { ...@@ -1130,7 +1130,7 @@ class BaseQcService {
solutionContent.status = "ABC_CLOSE_PRODUCE"; solutionContent.status = "ABC_CLOSE_PRODUCE";
solutionContent.statusName = this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE; solutionContent.statusName = this.ediSolutionStatusReference.ABC_CLOSE_PRODUCE;
} else { } else {
return system.getResultFail(-110, "状态错误"); return system.getResultFail(-110, "状态错误-1");
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
......
center-order/app/base/service/impl/qcutils/ncSve.js
...@@ -576,7 +576,7 @@ class NcService { ...@@ -576,7 +576,7 @@ class NcService {
// var newFlowStatus = []; // var newFlowStatus = [];
if (ns && ns.id) { if (ns && ns.id) {
if (ns.status == "ywc") { if (ns.status == "ywc") {
return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案"); return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案-4");
} }
var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : ""; var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : "";
if (flowStatus && ["NOT_ACCEPTED","CLOSE"].indexOf(flowStatus) < 0) { if (flowStatus && ["NOT_ACCEPTED","CLOSE"].indexOf(flowStatus) < 0) {
......
center-order/app/base/service/impl/qcutils/regCenterOrderSve.js
...@@ -338,7 +338,7 @@ class RegCenterOrderService{ ...@@ -338,7 +338,7 @@ class RegCenterOrderService{
solutionContent.status = "CLOSE"; solutionContent.status = "CLOSE";
solutionContent.statusName = this.regSolutionStatus.CLOSE; solutionContent.statusName = this.regSolutionStatus.CLOSE;
} else { } else {
return system.getResultFail(-110, "状态错误"); return system.getResultFail(-110, "状态错误-5");
} }
solutionContent.solutionFlowList = solutionFlowList; solutionContent.solutionFlowList = solutionFlowList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment