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

opt:优化补空架生成点位校验

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-15 17:20:27 +08:00
parent fb845ecfff
commit 8d703dc363
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -178,25 +178,19 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
String type = ObjectUtil.isNotEmpty(param.getString("task_type")) ? param.getString("task_type") : null; String type = ObjectUtil.isNotEmpty(param.getString("task_type")) ? param.getString("task_type") : null;
String vehicle_code = ObjectUtil.isNotEmpty(param.getString("vehicle_code")) ? param.getString("vehicle_code") : null; String vehicle_code = ObjectUtil.isNotEmpty(param.getString("vehicle_code")) ? param.getString("vehicle_code") : null;
String config_code = param.getString("config_code"); String config_code = param.getString("config_code");
if("4".equals(type)){ if("4".equals(type)){
//4-叫料 //4-叫料
}else if("5".equals(type)){ }else if("5".equals(type)){
//5-满料出库 //5-满料出库
if(device_code.startsWith("TBX")){ if(device_code.startsWith("TBX")){
config_code="MJXLTask"; config_code="MJXLTask";
param.put("config_code",config_code); param.put("config_code",config_code);
} }
}else if("6".equals(type)){ }else if("6".equals(type)){
//6-申请空盘 //6-申请空盘
}else if("7".equals(type)){ }else if("7".equals(type)){
//7-空托盘出库 //7-空托盘出库
} }
if(ObjectUtil.isEmpty(config_code)){ if(ObjectUtil.isEmpty(config_code)){
throw new BadRequestException("任务类型不正确!device_code："+device_code+",type："+type); throw new BadRequestException("任务类型不正确!device_code："+device_code+",type："+type);
} }

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJQKTask.java
View File

@@ -63,6 +63,9 @@ public class KJQKTask extends AbstractTask {
JSONObject extGroupData = JSONObject.parseObject(requestParam); JSONObject extGroupData = JSONObject.parseObject(requestParam);
// 根据对接位查找对应的载具类型 // 根据对接位查找对应的载具类型
SchBasePoint endPoint = pointService.getById(task.getPoint_code2()); SchBasePoint endPoint = pointService.getById(task.getPoint_code2());
if (!endPoint.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) {
throw new BadRequestException("目标点位:" + endPoint.getPoint_code() + ",点位状态不为无货,不满足补空架任务生成条件");
}
extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type()); extGroupData.put("vehicle_type", endPoint.getCan_vehicle_type());
SchBasePoint point = findStartPoint(startRegionStr, extGroupData); SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
if (ObjectUtil.isEmpty(point)) { if (ObjectUtil.isEmpty(point)) {
@@ -74,7 +77,7 @@ public class KJQKTask extends AbstractTask {
task.setRemark(""); task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode()); task.setTask_status(TaskStatus.CREATED.getCode());
taskService.save(task); taskService.save(task);
log.error("tofix_KJQKTask+" + task.getPoint_code1() + ":" + task.getPoint_code2() + "创建任务成功!");
point.setIng_task_code(task.getTask_code()); point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point); PointUtils.setUpdateByAcs(point);
pointService.updateById(point); pointService.updateById(point);