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);