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

浙大指令完成时判断是否取消&组盘找不到fix

Browse Source
This commit is contained in:
psh
2024-06-21 09:40:20 +08:00
parent 17dad5b99d
commit d5956ada3e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
View File

@@ -75,7 +75,7 @@ public class QueryZDAgvTaskStatus {
instructionService.update(inst); instructionService.update(inst);
} }
} else if ("FINISHED".equals(status)) { } else if ("FINISHED".equals(status)) {
if (inst != null){ if (inst != null&&!"3".equals(inst.getInstruction_status())){
String startPoint=inst.getStart_point_code(); String startPoint=inst.getStart_point_code();
Device start_device = deviceAppService.findDeviceByCode(startPoint); Device start_device = deviceAppService.findDeviceByCode(startPoint);
if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) { if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) {

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

@@ -210,7 +210,10 @@ public class GHCMLTask extends AbstractTask {
SchBasePoint startPointObj = pointService.getById(startPoint); SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint); SchBasePoint endPointObj = pointService.getById(endPoint);
if (ObjectUtil.isNotEmpty(endPointObj)) { if (ObjectUtil.isNotEmpty(endPointObj)) {
SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id()); SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo(
startPointObj.getVehicle_code(),
startPointObj.getVehicle_type(),
GroupBindMaterialStatusEnum.BOUND.getValue());
TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType); TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
vehiclematerialgroup.setTask_code(taskObj.getTask_code()); vehiclematerialgroup.setTask_code(taskObj.getTask_code());
// 设置链路id，使用任务编码 // 设置链路id，使用任务编码