From 015543ee5f1e402e9fcde790570422f0ddb6f174 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Tue, 19 Mar 2024 13:54:10 +0800 Subject: [PATCH] '123' --- .../storageLocation/storageLocationController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java index b02e535..63d2d9e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java @@ -161,7 +161,7 @@ public class storageLocationController extends BaseController //查询已录入库位信息 StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh); if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录 - return error("当前库位已被其他人选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); + return error("当前库位已被选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); } else { //插入操作记录表 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -181,7 +181,7 @@ public class storageLocationController extends BaseController return toAjax(storageLocationService.addStorageLocation(storageLocation)); } }else{ - return error("当前库位或被其他人领用,请刷新重试!"); + return error("当前库位可能已被领用,请刷新重试!"); } } @@ -227,7 +227,7 @@ public class storageLocationController extends BaseController //查询已录入库位信息 StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh); if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录 - return error("当前库位已被其他人选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); + return error("当前库位已被选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); } else { //查询已录入库位信息 StorageLocation sl = storageLocationService.selectYlrStorageLocation(materialBh); @@ -235,7 +235,7 @@ public class storageLocationController extends BaseController } } }else{ - return error("当前库位或被其他人领用,请刷新重试!"); + return error("当前库位可能已被领用,请刷新重试!"); } }