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

fix:二期出库rgv任务改成集中下发

Browse Source
This commit is contained in:
zhangzq
2025-04-05 17:30:17 +08:00
parent 2ef860727f
commit bb5513aa8e
2 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
View File

@@ -21,6 +21,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -235,8 +236,6 @@ public class TwoOutHeapTask extends AbstractAcsTask {
jsonParam.put("task_group_id", jsonTask.getString("task_group_id")); jsonParam.put("task_group_id", jsonTask.getString("task_group_id"));
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class); LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
bean1.createLashTask(jsonParam); bean1.createLashTask(jsonParam);
// 再次下发：找相同任务组的下发
sendTaskAcs(jsonTask.getString("task_group_id"),true);
} }
} }
} }
@@ -300,74 +299,61 @@ public class TwoOutHeapTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, IOSEnum.IS_NOTANDYES.code("否")); this.updateTaskStatus(taskObj, IOSEnum.IS_NOTANDYES.code("否"));
} }
@Transactional
public void sendTaskAcs(String groupTaskId,boolean retry) { public void sendTaskAcs(String groupTaskId,boolean retry) {
RedissonUtils.lock(c -> { WQLObject wo_Task = WQLObject.getWQLObject("sch_base_task");
WQLObject wo_Task = WQLObject.getWQLObject("sch_base_task"); List<JSONObject> taskArrAll = wo_Task
List<JSONObject> taskArrAll = wo_Task .query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' ORDER BY create_time")
.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and task_group_id = '" + groupTaskId + "'" + " and is_delete ='0' ORDER BY create_time") .getResultJSONArray(0).toJavaList(JSONObject.class);
.getResultJSONArray(0).toJavaList(JSONObject.class); // 是否下发多个AGV输送出库任务
if (CollectionUtils.isEmpty(taskArrAll)){
if (ObjectUtil.isEmpty(taskArrAll) && retry) { return;
taskArrAll = wo_Task }
.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' ORDER BY create_time") List<JSONObject> taskArr;
.getResultJSONArray(0).toJavaList(JSONObject.class); // 是否异常出库口任务
} String TWO_EXCEP = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("TWO_EXCEP").getValue();
if (TWO_EXCEP.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
// 是否下发多个AGV输送出库任务
String is_send_many = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_send_many").getValue(); String is_send_many = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_send_many").getValue();
// 是否异常出库口任务 if (is_send_many.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
String TWO_EXCEP = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("TWO_EXCEP").getValue(); // 只允许每个行架点位有一条任务
taskArr = sendTask(taskArrAll);
List<JSONObject> taskArr;
if (TWO_EXCEP.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
if (is_send_many.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
// 只允许每个行架点位有一条任务
taskArr = sendTask(taskArrAll);
} else {
taskArr = taskArrAll;
}
} else { } else {
taskArr = taskArrAll; taskArr = taskArrAll;
} }
} else {
taskArr = taskArrAll;
}
ArrayList<AcsTaskDto> resultList = new ArrayList<>(); ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < taskArr.size(); i++) { for (int i = 0; i < taskArr.size(); i++) {
JSONObject json = taskArr.get(i); JSONObject json = taskArr.get(i);
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type")) .task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1")) .start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2")) .next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code2")) .vehicle_code(json.getString("vehicle_code2"))
.vehicle_code2(json.getString("vehicle_code")) .vehicle_code2(json.getString("vehicle_code"))
.interaction_json(json.getJSONObject("request_param")) .interaction_json(json.getJSONObject("request_param"))
.priority(json.getString("priority")) .priority(json.getString("priority"))
.class_type(IOSEnum.ACS_TYPE.code("RGV输送任务")) .class_type(IOSEnum.ACS_TYPE.code("RGV输送任务"))
.dtl_type(String.valueOf(dtl_type)) .dtl_type(String.valueOf(dtl_type))
.product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .product_area(IOSEnum.PRODUCT_AREA.code("BLK"))
.remark(json.getString("remark")) .remark(json.getString("remark"))
.build(); .build();
if (json.getString("vehicle_code2").contains("A")) {
if (json.getString("vehicle_code2").contains("A")) { dto.setRoute_plan_code("two");
dto.setRoute_plan_code("two"); } else {
} else { dto.setRoute_plan_code("normal");
dto.setRoute_plan_code("normal");
}
resultList.add(dto);
// 更新任务为下发
JSONObject paramMap = new JSONObject();
paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
wo_Task.update(paramMap, "task_id ='" + json.getString("task_id") + "'");
// 调用下发
if (ObjectUtil.isNotEmpty(resultList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(resultList));
AcsUtil.notifyAcs("api/wms/task", arr);
}
} }
},"resendrgv", 30, this); resultList.add(dto);
// 调用下发
if (ObjectUtil.isNotEmpty(resultList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(resultList));
AcsUtil.notifyAcs("api/wms/task", arr);
}
}
} }
} }

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

@@ -313,10 +313,8 @@ public class LashManageServiceImpl implements LashManageService {
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code")); jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code"));
jsonTaskParam.put("request_param", whereJson); jsonTaskParam.put("request_param", whereJson);
TwoOutHeapTask bean = SpringContextHolder.getBean(TwoOutHeapTask.class); TwoOutHeapTask bean = SpringContextHolder.getBean(TwoOutHeapTask.class);
bean.createTask(jsonTaskParam); bean.createTask(jsonTaskParam);
bean.sendTaskAcs(whereJson.getString("task_group_id"),true);
} }
@Override @Override