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

add：新增日志

Browse Source
This commit is contained in:
tuqiang
2026-02-26 15:11:33 +08:00
parent dfcc97da03
commit 19dc730e6c
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -347,6 +347,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
this.agvphase = Integer.valueOf(agvphase);
this.reqTakeInstCode = taskId;
this.reqTakeRequireSuccess = true;
}
}
// B设置新任务

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/enums/TaskPhaseEnum.java
View File

@@ -29,7 +29,7 @@ public enum TaskPhaseEnum {
*/
public static TaskPhaseEnum fromPhase(String value) {
for (TaskPhaseEnum phase : values()) {
if (phase.getValue() == value) {
if (phase.getValue().equals(value)) {
return phase;
}
}

1
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java
View File

@@ -37,6 +37,7 @@ public class KitToAcsController {
for (String o : kitToAcsParam.keySet()) {
param = JSONObject.parseObject(o);
}
log.info("---kit上报请求---"+param.toString());
System.out.println("---kit上报请求---"+param.toString());
return new ResponseEntity<>(ndcToAcsService.agvCallback(param), HttpStatus.OK);
}

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class AcsToNDCServiceImpl implements AcsToNDCService {
luceneExecuteLogService.interfaceExecuteLog(logDto);
System.out.println("-------任务下发----"+JSON.toJSONString(jo));
long start = System.currentTimeMillis();
log.info("任务号：{},指令号{},状态{},下发agv订单序列下发:{}", instruction.getTask_code(), instruction.getInstruction_code());
log.info("任务号：{},指令号{},下发agv订单序列下发:{}", instruction.getTask_code(), instruction.getInstruction_code(),JSON.toJSONString(jo));
HttpResponse result = HttpRequest.post(url)
//表单内容
.body(String.valueOf(jo))

22
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java
View File

@@ -48,14 +48,16 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
if (StrUtil.isEmpty(taskPhase)){
resp.put("code", "400");
resp.put("message", "taskPhase参数异常");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
Instruction instruction = instructionService.findByCodeFromCache(instTaskId);
if (ObjectUtil.isEmpty(instruction)) {
instruction = instructionService.findByTaskcode(instTaskId);
instruction = instructionService.findByCode(instTaskId);
if (ObjectUtil.isEmpty(instruction)){
resp.put("code", "400");
resp.put("message", "请求失败，任务信息不存在,指令号:" + instTaskId);
log.info("---响应kit请求---"+resp.toString());
return resp;
}
instructionService.reload();
@@ -65,6 +67,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
instructionService.finish(instruction.getInstruction_id());
resp.put("code", "200");
resp.put("message", "完成任务成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//taskPhase 任务取消
@@ -72,6 +75,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
instructionService.cancel(instruction.getInstruction_id());
resp.put("code", "200");
resp.put("message", "取消任务成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
Device device = null;
@@ -83,12 +87,14 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
if (ObjectUtil.isEmpty(storageCellDto)) {
resp.put("code", "400");
resp.put("message", "请求失败，点位信息不存在,点位站点号:" + taskPoint);
log.info("---响应kit请求---"+resp.toString());
return resp;
}
device = deviceAppService.findDeviceByCode(storageCellDto.getStorage_code());
if (ObjectUtil.isEmpty(device)) {
resp.put("code", "400");
resp.put("message", "请求失败，请求位置编号不存在！");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
DeviceDriver deviceDriver = device.getDeviceDriver();
@@ -108,10 +114,11 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
if (device == null){
resp.put("code", "400");
resp.put("message", "点位驱动不存在");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
device.getDeviceDriver().setDeviceInnerParam(instTaskId,taskPhase);
if (!instruction.getExecute_status().equals(taskPhase)){
if (!taskPhase.equals(instruction.getExecute_status())){
instruction.setExecute_status(taskPhase);
instructionService.update(instruction);
}
@@ -119,10 +126,12 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
default:
resp.put("code", "400");
resp.put("message", "taskPhase值不存在");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
resp.put("code", "200");
resp.put("message", taskPhaseEnum.getDescription()+"处理完毕");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//任务分配车辆上报
@@ -133,6 +142,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
if (ObjectUtil.isEmpty(instruction)) {
resp.put("code", "400");
resp.put("message", "请求失败，任务信息不存在,指令号:" + taskId);
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//更新车号
@@ -142,12 +152,14 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
instructionService.update(instruction);
resp.put("code", "200");
resp.put("message", "更新车号成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
else if (MsgTypeEnum.TASK_RUN_RPT.getValue().equals(type)){
System.out.println("------");
resp.put("code", "200");
resp.put("message", "更新车号成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//车辆任务生成上报
@@ -157,6 +169,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
if (ObjectUtil.isEmpty(instruction)) {
resp.put("code", "400");
resp.put("message", "请求失败，任务信息不存在,指令号:" + taskId);
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//修改指令状态执行中
@@ -165,6 +178,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
instructionService.update(instruction);
resp.put("code", "200");
resp.put("message", "更新指令执行中成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
else if (MsgTypeEnum.AGV_POWER_RPT.getValue().equals(type)){
@@ -172,6 +186,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
int stateValue = params.getIntValue("stateValue");
resp.put("code", "200");
resp.put("message", "更新指令执行中成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
else if (MsgTypeEnum.AGV_STATE_RPT.getValue().equals(type)){
@@ -183,6 +198,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
int speed = params.getIntValue("speed");
resp.put("code", "200");
resp.put("message", "更新指令执行中成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
else if (MsgTypeEnum.AGV_ERROR_RPT.getValue().equals(type)){
@@ -190,10 +206,12 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
int errorCode = params.getIntValue("errState");
resp.put("code", "200");
resp.put("message", "更新指令执行中成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
resp.put("code", "400");
resp.put("message", type+"type类型未定义");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
}