From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 十月 2023 09:03:47 +0800 Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3 --- server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 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 68035c0..faa8b91 100644 --- a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java +++ b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java @@ -401,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