From 7a67790ca83e6ba393b712d99418338d0a2d30ea Mon Sep 17 00:00:00 2001 From: yanps Date: Sat, 22 Mar 2025 17:59:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A0=86=E5=9E=9B=E6=9C=BA=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard_stacker/StandardStackerDeviceDriver.java | 5 +++-- .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 2914d6faa..51c4e14fc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -800,9 +800,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ private void verifyPoint(String type,JSONObject jo) { Instruction instruction = checkInst(); + String[] point_codes = jo.getString("point_code").split("-"); if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) { List routeLineDtos = routeLineService.getShortPathLines(instruction.getStart_device_code(), - jo.getString("point_code"), instruction.getRoute_plan_code()); + point_codes[0], instruction.getRoute_plan_code()); if(CollUtil.isEmpty(routeLineDtos)){ errorPoint(jo, instruction); } @@ -812,7 +813,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme errorPoint(jo, instruction); } } else if(type.equals(StandarStirageErroEnum.VOIDANCE.getType())){ - List routeLineDtos = routeLineService.getShortPathLines(jo.getString("point_code"),instruction.getNext_device_code(), + List routeLineDtos = routeLineService.getShortPathLines(point_codes[0],instruction.getNext_device_code(), instruction.getRoute_plan_code()); if(CollUtil.isEmpty(routeLineDtos)){ errorPoint(jo, instruction); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 1fa3c70a0..1ff3a8f27 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -247,7 +247,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public Map queryAll(Map whereJson, Pageable page) { String task_code = (String) whereJson.get("task_code"); - String vehicle_code = (String) whereJson.get("vehicle_code"); + String vehicle_code = (String) whereJson.get("vehicle_code2"); String material_type = (String) whereJson.get("material_type"); String status = (String) whereJson.get("status"); String point_code = (String) whereJson.get("point_code");