xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-03-19 13:54:10 +08:00
parent 789ac20f7c
commit 015543ee5f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java
View File

@ -161,7 +161,7 @@ public class storageLocationController extends BaseController
//查询已录入库位信息 //查询已录入库位信息
StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh); StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh);
if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录 if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录
return error("当前库位已被其他人选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); return error("当前库位已被选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!");
} else { } else {
//插入操作记录表 //插入操作记录表
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -181,7 +181,7 @@ public class storageLocationController extends BaseController
return toAjax(storageLocationService.addStorageLocation(storageLocation)); return toAjax(storageLocationService.addStorageLocation(storageLocation));
} }
}else{ }else{
return error("当前库位或被其他人领用,请刷新重试!"); return error("当前库位可能已被领用,请刷新重试!");
} }
} }
@ -227,7 +227,7 @@ public class storageLocationController extends BaseController
//查询已录入库位信息 //查询已录入库位信息
StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh); StorageSelected storageSelected = storageLocationService.hasStorageLocation(materialBh);
if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录 if (StringUtils.isNotNull(kw_user2_name)&&storageSelected!=null) {//已选择领用，有选择领用记录
return error("当前库位已被其他人选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!"); return error("当前库位已被选择领用中，领用人账号:" + kw_user2_name + ",请先删除领用记录,再继续操作!");
} else { } else {
//查询已录入库位信息 //查询已录入库位信息
StorageLocation sl = storageLocationService.selectYlrStorageLocation(materialBh); StorageLocation sl = storageLocationService.selectYlrStorageLocation(materialBh);
@ -235,7 +235,7 @@ public class storageLocationController extends BaseController
} }
} }
}else{ }else{
return error("当前库位或被其他人领用,请刷新重试!"); return error("当前库位可能已被领用,请刷新重试!");
} }
} }