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

opt: 异常处理无点位创建半条任务2

Browse Source
This commit is contained in:
liyongde
2025-06-17 17:58:39 +08:00
parent 094b7104fc
commit 9781bbcc99
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
View File

@@ -56,6 +56,8 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
private IBstIvtShafttubeivtService shafttubeivtService; private IBstIvtShafttubeivtService shafttubeivtService;
@Autowired @Autowired
private TrussSendAirShaftTask trussSendAirShaftTask; private TrussSendAirShaftTask trussSendAirShaftTask;
@Autowired
private SendNBJExceptionPointTask sendNBJExceptionPointTask;
@Override @Override
public List<AcsTaskDto> addTask() { public List<AcsTaskDto> addTask() {
/* /*
@@ -122,24 +124,34 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
if (ObjectUtil.isEmpty(startPointObj.getQzz_no1()) && ObjectUtil.isEmpty(startPointObj.getQzz_no2())) { if (ObjectUtil.isEmpty(startPointObj.getQzz_no1()) && ObjectUtil.isEmpty(startPointObj.getQzz_no2())) {
// 查找半条任务，并创建下发 // 查找半条任务，并创建下发
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>() List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getTask_type, "010814") .in(SchBaseTask::getTask_type, "010814", "010812")
.eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode()) .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())
.eq(SchBaseTask::getIs_delete, "0") .eq(SchBaseTask::getIs_delete, "0")
.orderByAsc(SchBaseTask::getCreate_time)); .orderByAsc(SchBaseTask::getCreate_time));
if (list.size() > 0) { if (list.size() > 0) {
SchBaseTask schBaseTask = list.get(0); SchBaseTask schBaseTask = list.get(0);
JSONObject requestParam = JSONObject.parseObject(schBaseTask.getRequest_param()); if ("010814".equals(schBaseTask.getTask_type())) {
if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "A".equals(requestParam.getString("needPosition"))) { JSONObject requestParam = JSONObject.parseObject(schBaseTask.getRequest_param());
schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition")); if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "A".equals(requestParam.getString("needPosition"))) {
schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition"));
}
if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "B".equals(requestParam.getString("needPosition"))) {
schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition"));
}
schBaseTask.setRemark("AGV取货完成触发!");
schBaseTask.setUpdate_time(DateUtil.now());
schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
taskService.updateById(schBaseTask);
trussSendAirShaftTask.immediateNotifyAcs(schBaseTask.getTask_id());
} else if ("010812".equals(schBaseTask.getTask_type())) {
schBaseTask.setRemark("AGV取货完成触发!");
schBaseTask.setPoint_code2(task.getPoint_code1() + "_A");
schBaseTask.setUpdate_time(DateUtil.now());
schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
taskService.updateById(schBaseTask);
sendNBJExceptionPointTask.immediateNotifyAcs(schBaseTask.getTask_id());
} }
if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "B".equals(requestParam.getString("needPosition"))) {
schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition"));
}
schBaseTask.setRemark("AGV取货完成触发!");
schBaseTask.setUpdate_time(DateUtil.now());
schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
taskService.updateById(schBaseTask);
trussSendAirShaftTask.immediateNotifyAcs(schBaseTask.getTask_id());
} }
} }
} }