fix:修复下发逻辑,增加一楼补空载具/送满轴/装箱空载具三个任务直接下发逻辑

This commit is contained in:
zhangzq
2025-06-24 11:06:53 +08:00
parent 31b9884281
commit c300f9fdb9
4 changed files with 34 additions and 30 deletions

View File

@@ -55,6 +55,26 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
private IbstIvtPackageinfoivtService packageinfoivtService; private IbstIvtPackageinfoivtService packageinfoivtService;
@Override
public List<AcsTaskDto> addTask(SchBaseTask r) {
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(r.getTask_id().toString())
.task_code(r.getTask_code())
.task_type(r.getAcs_task_type())
.start_device_code(r.getPoint_code1())
.next_device_code(r.getPoint_code2())
.vehicle_code(r.getVehicle_code())
.priority(r.getPriority())
.remark(r.getRemark())
.product_area(r.getProduct_area())
.agv_action_type(r.getVehicle_code2())
.agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务"))
.interaction_json(JSON.parseObject(r.getRequest_param()))
.build();
resultList.add(dto);
return resultList;
}
@Override @Override
public List<AcsTaskDto> addTask() { public List<AcsTaskDto> addTask() {
@@ -188,7 +208,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
taskService.save(task); taskService.save(task);
//如果目标点位没有空位先创建不下发 //如果目标点位没有空位先创建不下发
if (isSend) { if (isSend) {
this.immediateNotifyAcs(null); this.immediateTaskNotifyAcs(task);
} }
return task.getTask_id(); return task.getTask_id();
} }

View File

@@ -336,7 +336,7 @@ public class MzhcwTask extends AbstractAcsTask {
taskService.save(task); taskService.save(task);
//如果目标点位没有空位先创建不下发 //如果目标点位没有空位先创建不下发
if (isSend) { if (isSend) {
this.immediateNotifyAcs(task,""); this.immediateTaskNotifyAcs(task);
} }
return task.getTask_id(); return task.getTask_id();
} }

View File

@@ -164,7 +164,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
taskService.save(task); taskService.save(task);
//如果目标点位没有空位先创建不下发 //如果目标点位没有空位先创建不下发
if (isSend) { if (isSend) {
this.immediateNotifyAcs(task,""); this.immediateTaskNotifyAcs(task);
} }
return task.getTask_id(); return task.getTask_id();
} }

View File

@@ -37,23 +37,13 @@ public abstract class AbstractAcsTask {
return addTask(); return addTask();
} }
public List<AcsTaskDto> schedule(String taskId) {
return addTask(taskId);
}
public List<AcsTaskDto> schedule(SchBaseTask task) {
return addTask(task);
}
/** /**
* 添加任务进行下发 * 添加任务进行下发
* *
* @return * @return
*/ */
public abstract List<AcsTaskDto> addTask(); public abstract List<AcsTaskDto> addTask();
public List<AcsTaskDto> addTask(String taskId){
throw new BadRequestException("当前类没有重写addTask(taskId)方法");
};
public List<AcsTaskDto> addTask(SchBaseTask task){ public List<AcsTaskDto> addTask(SchBaseTask task){
throw new BadRequestException("当前类没有重写addTask(taskId)方法"); throw new BadRequestException("当前类没有重写addTask(taskId)方法");
}; };
@@ -128,34 +118,28 @@ public abstract class AbstractAcsTask {
/** /**
* *
*/ */
public JSONObject immediateNotifyAcs(Object task_id) { public JSONObject immediateNotifyAcs(String task_id) {
try { try {
Thread.sleep(1000); Thread.sleep(1000);
}catch (Exception ex){ }catch (Exception ex){
} }
List<AcsTaskDto> taskList; List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isEmpty(task_id)){ if (ObjectUtil.isNotEmpty(taskList)) {
taskList = this.schedule(); JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
if (acsUtil == null){
return AcsUtil.notifyAcs("api/wms/task", arr);
}else { }else {
taskList = this.schedule((String) task_id); return acsUtil.notifyAcs3("api/wms/task", arr);
}
if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
if (acsUtil == null){
return AcsUtil.notifyAcs("api/wms/task", arr);
}else {
return acsUtil.notifyAcs3("api/wms/task", arr);
}
} }
}
return null; return null;
} }
public JSONObject immediateNotifyAcs(SchBaseTask task,String taskId) { public JSONObject immediateTaskNotifyAcs(SchBaseTask task) {
if (task==null){ if (task==null){
throw new BadRequestException("任务下发参数不能为空"); throw new BadRequestException("任务下发参数不能为空");
} }
List<AcsTaskDto> taskList = this.schedule(task); List<AcsTaskDto> taskList = this.addTask(task);
if (ObjectUtil.isNotEmpty(taskList)) { if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
if (acsUtil == null){ if (acsUtil == null){