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

opt:优化二次分配锁力度；优化重复申请时直接反馈陈工

Browse Source
This commit is contained in:
zhangzq
2025-06-12 20:02:47 +08:00
parent 251723507c
commit 25f796e201
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -184,7 +184,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
} }
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
return null; return null;
},"sendProductToFirstFloor",null); },"sendProductToFirstFloor"+actionType,null);
log.info("一楼装箱区点位二次分配" + taskCode + "---------------------------------------------" + result); log.info("一楼装箱区点位二次分配" + taskCode + "---------------------------------------------" + result);
return result; return result;
} }
@@ -626,7 +626,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
if (actionType.equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) { if (actionType.equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
if (StringUtils.isNotBlank(baseTask.getRequest_param())) { if (StringUtils.isNotBlank(baseTask.getRequest_param())) {
if (baseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) { if (baseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
throw new BadRequestException(baseTask.getTask_code() + "取货完成失败" + ",该任务已发送过取货完成信号请勿频繁发送！"); return;
} }
} }
if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区")) || if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区")) ||
@@ -654,18 +654,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
upDateIvtOrTask(baseTask, pointCode); upDateIvtOrTask(baseTask, pointCode);
} }
} }
// else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ||
// baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) ||
// baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区")) ||
// baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区")) ||
// baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
// baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
// || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
// )) {
// //取货完成信号
// upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
// handleGroupTask(baseTask);
// }
else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) || else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")) baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
|| baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务")) || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
@@ -678,7 +666,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
//放货完成信号请求 //放货完成信号请求
if (StringUtils.isNotBlank(baseTask.getCar_no())) { if (StringUtils.isNotBlank(baseTask.getCar_no())) {
if (baseTask.getCar_no().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货完成"))) { if (baseTask.getCar_no().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货完成"))) {
throw new BadRequestException(baseTask.getTask_code() + "放货完成失败" + ",该任务已发送过放货完成信号请勿频繁发送！"); return;
} }
} }
//放货任务 //放货任务

2
lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
View File

@@ -32,7 +32,7 @@ public class RedissonUtils {
if (isLock){ if (isLock){
process.apply(param); process.apply(param);
} else { } else {
return; throw new BadRequestException(key+"当前业务正在执行中");
} }
}catch (Exception ex){ }catch (Exception ex){
throw ex; throw ex;