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:
zhangzq
2025-03-02 10:22:57 +08:00
parent 89ecd6ef4e
commit be36159386
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,6 +372,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
throw new BadRequestException("当前木箱"+boxSn+"库存信息查询不到,请确认"); throw new BadRequestException("当前木箱"+boxSn+"库存信息查询不到,请确认");
} }
JSONObject boxAttr = boxAttrs.getJSONObject(0); JSONObject boxAttr = boxAttrs.getJSONObject(0);
int hasTask = taskService.count(new QueryWrapper<SchBaseTask>()
.eq("is_delete", "0")
.eq("point_code1", boxAttr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (hasTask>0){
throw new BadRequestException("当前空木箱"+boxSn+"存在正在执行的任务,稍后再操作");
}
String task_group_id = null; String task_group_id = null;
if (boxAttr.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) { if (boxAttr.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
JSONObject 浅Attr = attrTab JSONObject 浅Attr = attrTab
@@ -383,20 +392,20 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) { if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
// 判断浅货位木箱和深货位木箱是否相同规格 // 判断浅货位木箱和深货位木箱是否相同规格
task_group_id = outBoxManageService.createBoxMove(浅Attr); task_group_id = outBoxManageService.createBoxMove(浅Attr);
} else if(!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("木箱出库锁"))) { } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
// 判断是否是空木箱出库锁 int 浅Task = taskService.count(new QueryWrapper<SchBaseTask>()
.eq("is_delete", "0")
.eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (浅Task == 0){
task_group_id = outBoxManageService.createBoxMove(浅Attr);
}
}else {
throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
} }
} }
} }
int moveTask = taskService.count(new QueryWrapper<SchBaseTask>()
.eq("task_type", "010704")
.eq("is_delete", "0")
.eq("point_code1", boxAttr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (moveTask>0){
throw new BadRequestException("当前子卷已经装箱入库");
}
// 生成任务 // 生成任务
JSONObject jsonTaskParam = new JSONObject(); JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010704"); jsonTaskParam.put("task_type", "010704");

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
View File

@@ -211,7 +211,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code")); throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code"));
} }
// 锁定起点 // 锁定起点
jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("木箱出库锁")); jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
attrTab.update(jsonAttr); attrTab.update(jsonAttr);
// 清空缓存 // 清空缓存
notOutRowList.clear(); notOutRowList.clear();