From cd869a5bf36b01997aed5967db42efb92e424ebe Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 8 Dec 2022 09:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=A2=86=E7=94=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202022=E5=B9=B412=E6=9C=8808=E6=97=A5=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/toolman/service/impl/ToolHeaderServiceImpl.java | 6 +++++- src/main/resources/static/js/pda/toolBorrowingReturn.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java index 69563f8..3123373 100644 --- a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java @@ -389,7 +389,11 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { if (!"领用出库".equals(toolDetail.getStatusRef())) { throw new XJException(ResponseEnum.TOOL_DETAIL_DISABLE); } - } else { + }else if ("借用返回".equals(toolDetailQueryList.get(i).getTransType())) { + if (!"借用出库".equals(toolDetail.getStatusRef())) { + throw new XJException(ResponseEnum.TOOL_DETAIL_DISABLE); + } + } else { if (StringUtils.isNotBlank(toolDetail.getStatusRef())) { throw new XJException(ResponseEnum.TOOL_DETAIL_DISABLE); } diff --git a/src/main/resources/static/js/pda/toolBorrowingReturn.js b/src/main/resources/static/js/pda/toolBorrowingReturn.js index a8023d1..0f7e963 100644 --- a/src/main/resources/static/js/pda/toolBorrowingReturn.js +++ b/src/main/resources/static/js/pda/toolBorrowingReturn.js @@ -228,7 +228,7 @@ function updateToolDetail(){ direction : "+", userName :userName, status: "已投用", - statusRef: "借用入库", + statusRef: "", remark:remark }; alreadyList.push(jsonData);