diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index f1e0269..a51bbff 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -124,6 +124,7 @@ public class NDCAgvServiceImpl implements NDCAgvService { (byte) fhdhigh, (byte) fhdlow }; log.info("下发AGV作业指令--{}", str1); + log.info("下发AGV作业任务--{}", inst.getInstruction_code()+"-----"+Bytes2HexString(b)); OneNDCSocketConnectionAutoRun.write(b); System.out.println("下发agv指令数据:" + Bytes2HexString(b)); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 1a0f5de..c3e7e7c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -110,7 +110,7 @@ public interface AcsToWmsService { * @param arr * @return */ - HttpResponse feedTaskStatus(JSONArray arr); + HttpResponse feedTaskStatus(JSONObject arr); /** * ACS向WMS反馈任务状态 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 3aff84b..49b65ea 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -165,20 +165,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - public HttpResponse feedTaskStatus(JSONArray data) { + public HttpResponse feedTaskStatus(JSONObject data) { //feedTaskStatus try { MDC.put(log_file_type, log_type); String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - String task_code = ""; - for (int i = 0; i < data.size(); i++) { - JSONObject json = (JSONObject) data.get(i); - task_code = json.getString("task_code"); - } - TaskDto taskDto = taskService.findByCode(task_code); - String vehicle_code = taskDto.getVehicle_code(); - HttpResponse result2 = null; log.info("feedbackTaskStatusToWms-----请求参数{}", data.toString()); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 6227b3a..01138d0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -287,7 +287,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("remark", remark); jo.put("params", params); jo.put("params2", params2); - jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); + jo.put("task_type", task_type); jo.put("class_type", class_type); jo.put("route_plan_code", route_plan_code); jo.put("paper_array", JSONUtil.toJsonStr(paper_array)); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 61307f3..7825f9b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1467,11 +1467,9 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (ObjectUtil.isNotEmpty(entity.getWeight())) { feed_jo.put("weight", entity.getWeight()); } - JSONArray ja = new JSONArray(); - ja.add(feed_jo); //TODO 有需要根据上位系统反馈的信息再做进一步处理 CompletableFuture.runAsync(() -> { - acstowmsService.feedTaskStatus(ja); + acstowmsService.feedTaskStatus(feed_jo); // 异步更新任务状态 try { } catch (Exception e) {