From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
index 51b8316..faa8b91 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
@@ -276,8 +276,11 @@
//宸ュ崟瀵硅薄
Workorder workorder=workorderExtMapper.selectById(wc.getWorkorderId());
- if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
- ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
+ if(workorder==null
+ || workorder.getStatus()==Constants.WORKORDER_STATUS.done
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
return ApiResponse.failed("宸ュ崟涓嶅厑璁告楠�");
}
if(workorder.getPlanNum()!=null){
@@ -398,7 +401,7 @@
//宸ュ崟瀵硅薄
Workorder workorder=workorderExtMapper.selectById(wc.getWorkorderId());
- if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
+ if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
||workorder.getStatus()==Constants.WORKORDER_STATUS.instock ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
return ApiResponse.failed("宸ュ崟涓嶅厑璁告楠�");
}
--
Gitblit v1.9.3