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

rev 新增日志

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-08-15 11:23:13 +08:00
parent 8d01750f8f
commit a3b3e3043e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -693,6 +693,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
apply.put("device_code", device_code); apply.put("device_code", device_code);
apply.put("task_id", taskDto.getExt_task_id()); apply.put("task_id", taskDto.getExt_task_id());
apply.put("type", "12"); apply.put("type", "12");
logServer.deviceExecuteLog(device_code, "", "", "申请任务请求参数:"+apply);
String str = acsToWmsService.applyTaskToWms(apply); String str = acsToWmsService.applyTaskToWms(apply);
JSONObject jo = JSON.parseObject(str); JSONObject jo = JSON.parseObject(str);
if (ObjectUtil.isEmpty(jo)) { if (ObjectUtil.isEmpty(jo)) {
@@ -708,8 +709,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
message = "申请AGV任务失败," + jo.get("message").toString(); message = "申请AGV任务失败," + jo.get("message").toString();
} }
} }
} else { logServer.deviceExecuteLog(device_code, "", "", "申请任务返回参数:"+jo);
logServer.deviceExecuteLog(device_code, "", "", "未申请agv任务，task:"+task);
} }
return true; return true;
} }

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

@@ -220,6 +220,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
public Instruction findByCode(String code) { public Instruction findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("acs_instruction"); WQLObject wo = WQLObject.getWQLObject("acs_instruction");
JSONObject json = wo.query("instruction_code ='" + code + "'").uniqueResult(0); JSONObject json = wo.query("instruction_code ='" + code + "'").uniqueResult(0);
if(ObjectUtil.isEmpty(json)){
return null;
}
final Instruction obj = json.toJavaObject(Instruction.class); final Instruction obj = json.toJavaObject(Instruction.class);
return obj; return obj;
} }