From 85e42f9ca4f5549c975b4c3f1afd1bb6ed395370 Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 21 Jun 2024 16:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=8C=96=E5=AE=A4=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96&agv=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java | 6 +++--- .../java/org/nl/wms/sch/point/service/dao/SchBasePoint.java | 3 +++ .../nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index e9aaa5a..37d8786 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -234,10 +234,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } else { //上报异常信息 //（不需要WCS反馈） - if (phase == 0x67) { - device = deviceAppService.findDeviceByCode(Integer.toString(arr[27])); + if (phase == 0x67 || phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) { + device = deviceAppService.findDeviceByCode("AGV0" +agvaddr); } else { - device = deviceAppService.findDeviceByCode("AGV0" + Integer.toString(arr[20])); + device = deviceAppService.findDeviceByCode("AGV0" + arr[20]); } if (ObjectUtil.isNotEmpty(device)) { if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java index b2073d0..17a2879 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java @@ -147,4 +147,7 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "放货等待点") private String next_wait_point; + @TableField(exist = false) + private String material_id; + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java index e2b6f55..22c6e2e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java @@ -114,6 +114,7 @@ public class GHCMLTask extends AbstractTask { JSONObject jsonObject = JSONObject.parseObject(requestParam); jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); + log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code()); if (ObjectUtil.isEmpty(point)) { throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!"); }