From f83b62252df79afbfa19f4cf1be0487d9e37a123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:48:09 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index f08af58..5c9a035 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -556,6 +556,11 @@
                     && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
                 return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
             }
+        }else{
+            if (checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FWWC)
+                    || checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FFJS)) {
+                return new AjaxResult(AjaxResult.STATUS_FAIL, "当前状态无法取消订单");
+            }
         }
         return erpCancelOrder(services);
     }

--
Gitblit v1.9.1