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

rev:自动完成时更改物料来源

Browse Source
This commit is contained in:
gengby
2023-12-20 08:49:13 +08:00
parent a783eee4d7
commit 32e505f8b1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -783,6 +783,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo1.put("material_type", dto.getMaterial());
jo1.put("batch", dto.getBatch());
jo1.put("vehicle_code", dto.getVehicle_code());
jo1.put("source_device", dto.getStart_device_code());
deviceService.changeDeviceStatus(jo1);
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;

8
hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java
View File

@@ -109,11 +109,11 @@ public class QueryXZAgvTaskStatus {
}
} else if ("STOPPED".equals(state) || "FAILED".equals(state) || "Error".equals(state)) {
if (inst != null) {
// inst.setInstruction_status("1");
// instructionService.update(inst);
inst.setInstruction_status("1");
instructionService.update(inst);
//任务失败时取消指令和任务
instructionService.cancel(inst.getInstruction_id());
taskService.cancel(inst.getTask_id());
// instructionService.cancel(inst.getInstruction_id());
// taskService.cancel(inst.getTask_id());
}
}
// else if ("STOPPED".equals(state)){