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

fix: 堆垛机路由校验优化

Browse Source
This commit is contained in:
yanps
2025-03-22 17:59:34 +08:00
parent c20293c9ec
commit 7a67790ca8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
View File

@@ -800,9 +800,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/ */
private void verifyPoint(String type,JSONObject jo) { private void verifyPoint(String type,JSONObject jo) {
Instruction instruction = checkInst(); Instruction instruction = checkInst();
String[] point_codes = jo.getString("point_code").split("-");
if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) { if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) {
List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(instruction.getStart_device_code(), List<RouteLineDto> 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)){ if(CollUtil.isEmpty(routeLineDtos)){
errorPoint(jo, instruction); errorPoint(jo, instruction);
} }
@@ -812,7 +813,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
errorPoint(jo, instruction); errorPoint(jo, instruction);
} }
} else if(type.equals(StandarStirageErroEnum.VOIDANCE.getType())){ } else if(type.equals(StandarStirageErroEnum.VOIDANCE.getType())){
List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(jo.getString("point_code"),instruction.getNext_device_code(), List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(point_codes[0],instruction.getNext_device_code(),
instruction.getRoute_plan_code()); instruction.getRoute_plan_code());
if(CollUtil.isEmpty(routeLineDtos)){ if(CollUtil.isEmpty(routeLineDtos)){
errorPoint(jo, instruction); errorPoint(jo, instruction);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -247,7 +247,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
public Map<String, Object> queryAll(Map whereJson, Pageable page) { public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String task_code = (String) whereJson.get("task_code"); 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 material_type = (String) whereJson.get("material_type");
String status = (String) whereJson.get("status"); String status = (String) whereJson.get("status");
String point_code = (String) whereJson.get("point_code"); String point_code = (String) whereJson.get("point_code");