root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:深浅货位被锁定提示优化

Browse Source
This commit is contained in:
zhouz
2025-09-09 13:41:57 +08:00
parent 522abe91c7
commit 2bcaebfa14
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -460,10 +460,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
.eq("point_code1", 浅Attr.getString("struct_code")) .eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位存在任务" + 浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
} }
} else { } else {
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位存在任务" + 浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
} }
} }
} }

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
View File

@@ -92,6 +92,8 @@ public class TwoOutBoxTask extends AbstractAcsTask {
.uniqueResult(0); .uniqueResult(0);
if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) { if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) {
if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) { if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
json.put("remark", "当前仓位对应的浅货位【" + 浅Attr.getString("struct_code") + "被锁定无法下发任务！】");
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
continue; continue;
} }
} else { } else {
@@ -104,6 +106,8 @@ public class TwoOutBoxTask extends AbstractAcsTask {
.eq("point_code1", 浅Attr.getString("struct_code")) .eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
json.put("remark", "当前仓位对应的浅货位【" + 浅Attr.getString("struct_code") + "有正在执行中的任务，任务完成后才能下发！】");
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
continue; continue;
} else { } else {
outBoxManageService.createBoxMove(浅Attr); outBoxManageService.createBoxMove(浅Attr);