工具领用修改 2022年12月08日 sxm

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

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