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

自测问题修复

Browse Source
This commit is contained in:
psh
2023-11-28 18:04:30 +08:00
parent 715cc94e76
commit 8b9cfe49e0
7 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -337,6 +337,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
int start_address=deviceService.queryAddressBydeviceCode(start_point);
int next_address=deviceService.queryAddressBydeviceCode(next_point);
taskService.update(task);
inst.setStart_point_code(start_point);
inst.setStart_device_code(start_point);
inst.setNext_point_code(next_point);
inst.setNext_device_code(next_point);
instructionService.update(inst);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, start_address, next_address, start_height, next_height);
log.info("指令号:{},phase:{},acs请求wms申请成功", inst.getInstruction_code(),phase);
}else{

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/Instruction.java
View File

@@ -26,6 +26,10 @@ public class Instruction extends InstructionDto implements Serializable {
public Instruction() {
}
public Instruction(InstructionDto instructionDto) {
BeanUtil.copyProperties(instructionDto,this, CopyOptions.create().setIgnoreNullValue(true));
}
public void copyFrom(Instruction source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java
View File

@@ -38,7 +38,7 @@ public class InstructionController {
//@PreAuthorize("@el.check('instruction:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
if(ObjectUtil.isEmpty(whereJson.get("status"))) {
whereJson.put("status", "1");
whereJson.put("status", "0");
}
return new ResponseEntity<>(instructionService.queryAll(whereJson, page), HttpStatus.OK);
}

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -807,7 +807,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (StrUtil.equals(task.getNext_device_code(), instnextdevice)) {
taskService.finish(task.getTask_id());
} else {
finishAndCreateNextInst((Instruction) entity);
finishAndCreateNextInst(new Instruction(entity));
}
}