From 9864e5bb1705eee3eb5ac203b28fc4efe1152fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Wed, 23 Aug 2023 08:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/ZheDaAgvServiceImpl.java | 317 +++++++++++------- .../LubeiConveyorDeviceDriver.java | 2 +- .../task/service/impl/TaskServiceImpl.java | 16 +- .../quartz/task/QueryZDAgvTaskStatus.java | 9 +- .../log/LubeiConveyorDeviceDriver.xml | 33 ++ .../src/main/resources/logback-spring.xml | 1 + 6 files changed, 245 insertions(+), 133 deletions(-) create mode 100644 acs/nladmin-system/src/main/resources/log/LubeiConveyorDeviceDriver.xml diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index d1ea11e..32581ee 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -168,10 +168,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { Instruction inst = instructionService.findByCodeFromCache(jobno); TaskDto task = taskService.findByCode(inst.getTask_code()); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); Device addressdevice = appService.findDeviceByCode(address); - + String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); LubeiConveyorDeviceDriver lubeiConveyorDeviceDriver; StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; @@ -182,18 +181,36 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) { lubeiConveyorDeviceDriver = (LubeiConveyorDeviceDriver) addressdevice.getDeviceDriver(); if(lubeiConveyorDeviceDriver.getMove()==1 && lubeiConveyorDeviceDriver.getAction()==1){ - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","applyTake"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyTake"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); + } + }else{ + if(StrUtil.equals(task.getTask_type(),"定点任务")){ + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyTake"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); + } + } } } else { log.info("设备{} 请求取货，光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove()); @@ -203,7 +220,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { JSONObject jo = new JSONObject(); jo.put("taskCode",task.getTask_code()); jo.put("carId",processingVehicle); - jo.put("taskType ",type); + jo.put("taskType ",task.getTask_type()); jo.put("feedbackStatus","applyTake"); log.info("请求参数:{}",jo); HttpResponse result= acsToWmsZDService.taskFeedback(jo); @@ -215,18 +232,20 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } } if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","applyTake"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyTake"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); + } } } @@ -235,25 +254,47 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) { lubeiConveyorDeviceDriver = (LubeiConveyorDeviceDriver) addressdevice.getDeviceDriver(); if(lubeiConveyorDeviceDriver.getMove()==0){ - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","takeFinish"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - log.info("请求ZDwcs成功，取货完成 请求结果{}",responseCode); - } - lubeiConveyorDeviceDriver.writing(2); - if(lubeiConveyorDeviceDriver.getTo_command() == 2){ - is_feedback = true; - } else { + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "takeFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); + } lubeiConveyorDeviceDriver.writing(2); + if (lubeiConveyorDeviceDriver.getTo_command() == 2) { + is_feedback = true; + } else { + lubeiConveyorDeviceDriver.writing(2); + } + }else{ + if(StrUtil.equals(task.getTask_type(),"定点任务")){ + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "takeFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); + } + lubeiConveyorDeviceDriver.writing(2); + if (lubeiConveyorDeviceDriver.getTo_command() == 2) { + is_feedback = true; + } else { + lubeiConveyorDeviceDriver.writing(2); + } + } } - } else { log.info("设备{} 请求离开，光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove()); } @@ -262,7 +303,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { JSONObject jo = new JSONObject(); jo.put("taskCode",task.getTask_code()); jo.put("carId",processingVehicle); - jo.put("taskType ",type); + jo.put("taskType ",task.getTask_type()); jo.put("feedbackStatus","takeFinish"); log.info("请求参数:{}",jo); HttpResponse result= acsToWmsZDService.taskFeedback(jo); @@ -274,18 +315,20 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } } if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","takeFinish"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "takeFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); + } } } } @@ -297,18 +340,36 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) { lubeiConveyorDeviceDriver = (LubeiConveyorDeviceDriver) addressdevice.getDeviceDriver(); if(lubeiConveyorDeviceDriver.getMove()==0 && lubeiConveyorDeviceDriver.getAction()==1){ - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","applyPut"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，开始放货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyPut"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，开始放货 请求结果{}", responseCode); + } + }else{ + if(StrUtil.equals(task.getTask_type(),"定点任务")){ + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyPut"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，开始放货 请求结果{}", responseCode); + } + } } } else { log.info("设备{} 请求放货，光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove()); @@ -318,7 +379,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { JSONObject jo = new JSONObject(); jo.put("taskCode",task.getTask_code()); jo.put("carId",processingVehicle); - jo.put("taskType ",type); + jo.put("taskType ",task.getTask_type()); jo.put("feedbackStatus","applyPut"); log.info("请求参数:{}",jo); HttpResponse result= acsToWmsZDService.taskFeedback(jo); @@ -330,18 +391,20 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } } if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","applyPut"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "applyPut"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，开始放货 请求结果{}", responseCode); + } } } } @@ -349,23 +412,46 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) { lubeiConveyorDeviceDriver = (LubeiConveyorDeviceDriver) addressdevice.getDeviceDriver(); if(lubeiConveyorDeviceDriver.getMove()==1){ - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","putFinish"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - log.info("请求ZDwcs成功，放货完成 请求结果{}",responseCode); - } - lubeiConveyorDeviceDriver.writing(3); - if(lubeiConveyorDeviceDriver.getTo_command() == 3){ - is_feedback = true; - } else { - lubeiConveyorDeviceDriver.writing(3); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "putFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); + } + lubeiConveyorDeviceDriver.writing(4); + if (lubeiConveyorDeviceDriver.getTo_command() == 4) { + is_feedback = true; + } else { + lubeiConveyorDeviceDriver.writing(4); + } + }else{ + if(StrUtil.equals(task.getTask_type(),"定点任务")){ + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "putFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); + } + lubeiConveyorDeviceDriver.writing(4); + if (lubeiConveyorDeviceDriver.getTo_command() == 4) { + is_feedback = true; + } else { + lubeiConveyorDeviceDriver.writing(4); + } + } } } else { log.info("设备{} 请求离开，光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove()); @@ -375,7 +461,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { JSONObject jo = new JSONObject(); jo.put("taskCode",task.getTask_code()); jo.put("carId",processingVehicle); - jo.put("taskType ",type); + jo.put("taskType ",task.getTask_type()); jo.put("feedbackStatus","putFinish"); log.info("请求参数:{}",jo); HttpResponse result= acsToWmsZDService.taskFeedback(jo); @@ -387,18 +473,20 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } } if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { - JSONObject jo = new JSONObject(); - jo.put("taskCode",task.getTask_code()); - jo.put("carId",processingVehicle); - jo.put("taskType ",type); - jo.put("feedbackStatus","putFinish"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - is_feedback = true; - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); + if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", processingVehicle); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "putFinish"); + log.info("请求参数:{}", jo); + HttpResponse result = acsToWmsZDService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode == 0) { + is_feedback = true; + log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); + } } } } @@ -416,8 +504,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { System.out.println("back agv:" + requestjo); - String agvurl = acsConfigService.findConfigFromCache().get(AcsConfig.AGVURL); - String agvport = acsConfigService.findConfigFromCache().get(AcsConfig.AGVPORT); + String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); agvurl = agvurl + ":" + agvport + "/rmds/v1/transportOrders/" + jobno + "/interact"; @@ -426,6 +514,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { .body(String.valueOf(requestjo)) .timeout(20000)//超时，毫秒 .execute(); + log.info("请求地址agvurl{},请求结果{}",agvurl,result.body()); } return requestjo.toString(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java index 85c9c64..2a2f7b5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java @@ -326,7 +326,7 @@ public class LubeiConveyorDeviceDriver extends AbstractOpcDeviceDriver implement Map itemMap = new HashMap(); itemMap.put(to_command, command); this.control(itemMap); - + log.info("下发的命令值是{}",command); } public void writing(int type, int command) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index e100117..9251579 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -867,23 +867,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); String Type1=entity.getTask_type(); - if(StrUtil.equals(Type1,"定点任务")){ - JSONObject jo = new JSONObject(); - jo.put("taskCode",entity.getTask_code()); - jo.put("carId",""); - jo.put("taskType ",entity.getTask_type()); - jo.put("feedbackStatus","taking"); - log.info("请求参数:{}",jo); - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - JSONObject response=JSONObject.parseObject(result.body()); - int responseCode= response.getInteger("responseCode"); - if(responseCode == 0) { - log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode); - } - } if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { JSONObject feed_jo = new JSONObject(); - feed_jo.put("task_code", entity.getTask_code()); + feed_jo.put("taskCode", entity.getTask_code()); // JSONArray ja = new JSONArray(); // ja.add(feed_jo); // acstowmsService.feedbackTaskStatusToWms(ja); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java index 6da4679..4fbd4dd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java @@ -52,12 +52,14 @@ public class QueryZDAgvTaskStatus { } //反馈结果状态 log.info("instcode：" + inst_code + "," + inst_jo.toString()); - String state = inst_jo.getString("state"); + String state = inst_jo.getString("status"); String vehicle = ""; //正在执行指令agv车号 if (!StrUtil.isEmpty(inst_jo.getString("vehicle"))) { vehicle = inst_jo.getString("vehicle"); inst.setCarno(vehicle); + log.info("车号是{}",vehicle); + } // RAW：初始状态 // ACTIVE：业务订单已激活 @@ -81,10 +83,9 @@ public class QueryZDAgvTaskStatus { String Type1=entity.getTask_type(); if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); jo.put("taskCode",entity.getTask_code()); - jo.put("carId","111"); + jo.put("carId",vehicle); jo.put("taskType ",entity.getTask_type()); jo.put("feedbackStatus","taking"); log.info("请求参数:{}",jo); @@ -132,12 +133,14 @@ public class QueryZDAgvTaskStatus { if (inst != null) { inst.setInstruction_status("2"); instructionService.finish(inst); + continue; } } else if ("WITHDRAWN".equals(state) || "FAILED".equals(state)) { if (inst != null) { inst.setInstruction_status("3"); instructionService.update(inst); instructionService.removeByCodeFromCache(inst_jo.getString("task_code")); + continue; } } JSONArray ja = inst_jo.getJSONArray("destinations"); diff --git a/acs/nladmin-system/src/main/resources/log/LubeiConveyorDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/LubeiConveyorDeviceDriver.xml new file mode 100644 index 0000000..96be2bb --- /dev/null +++ b/acs/nladmin-system/src/main/resources/log/LubeiConveyorDeviceDriver.xml @@ -0,0 +1,33 @@ + + + + + + + + +${LOG_HOME}/驱动日志/%d{yyyy-MM-dd}.%i.log + +15 + +200MB + +2GB + + + +%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n +${log.charset} + + + + + + + + + + + diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index 9b9acf4..84ea520 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -31,6 +31,7 @@ https://juejin.cn/post/6844903775631572999 +