laolan

center-order/app/base/service/impl/qcutils/regCenterOrderSve.js

@@ -886,7 +886,7 @@ class RegCenterOrderService{
     if (!needinfo || !needinfo.id) {
     if (!needinfo || !needinfo.id) {
       return system.getResultFail(-201, "未知需求信息");
       return system.getResultFail(-201, "未知需求信息");
     }
     }
-    if (needinfo.status == "ygb") {
+    if (needinfo.status == "ygb" || needinfo.status == "ycd") {
       return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
       return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
     }
     }
     //获取方案信息
     //获取方案信息
@@ -901,12 +901,12 @@ class RegCenterOrderService{
       for (i = 0; i < nsLength; i++) {
       for (i = 0; i < nsLength; i++) {
         if (ns[i].id) {
         if (ns[i].id) {
           if (ns[i].status == "ywc") {
           if (ns[i].status == "ywc") {
-            return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案");
+            return system.getResultFail(-103, "方案状态错误，不能废弃"+ ns[i].statusName  +"方案");
           }
           }
           var flowStatus = ns[i].solutionContent && ns[i].solutionContent.status ? ns[i].solutionContent.status : "";
           var flowStatus = ns[i].solutionContent && ns[i].solutionContent.status ? ns[i].solutionContent.status : "";
 
 
-          if (flowStatus && ["CLOSE"].indexOf(flowStatus) < 0) {
-            return system.getResultFail(-104, "⽅案状态为关闭才可关闭需求");
+          if (flowStatus && ["SUCCESS"].indexOf(flowStatus) == 0) {
+            return system.getResultFail(-104, "方案状态为已完成，不能关闭需求");
           }
           }
           var self = this
           var self = this
           await this.needsolutionDao.db.transaction(async function (t) {
           await this.needsolutionDao.db.transaction(async function (t) {