From c301a5be2ee3d7c846b56b3385b3b6c1bd9d2ba0 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 05 六月 2025 20:50:25 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java index 5c97cb1..f56f198 100644 --- a/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java +++ b/src/main/java/com/zy/asrs/utils/SortTheExecutionOfTheCarUtil.java @@ -3,6 +3,7 @@ import com.zy.asrs.entity.BasDevpPosition; import com.zy.asrs.entity.WrkMast; import com.zy.core.enums.RouteCollectCountType; +import org.apache.xmlbeans.impl.xb.xsdschema.All; import java.util.*; @@ -91,7 +92,7 @@ Integer integer = LatelyAndLessThan(devpPosition, nowPosition,perimeter); for (BasDevpPosition basDevpPosition:devpPosition){ if (basDevpPosition.getDevNo().equals(integer)){ - if (basDevpPosition.getDevNo() == 133){ + if (basDevpPosition.getDevNo() == 134){ result = 101; } break; @@ -206,6 +207,30 @@ } //閫嗗簭鎺掑垪 + public static List<List<Integer>> siteListAll(List<BasDevpPosition> devpPosition){ + List<List<Integer>> sitePositions = new ArrayList<>(); + Integer[] integers = new Integer[devpPosition.size()]; + List<Integer> devRegions = new ArrayList<>(); + int i = 0; + for (BasDevpPosition basDevpPosition : devpPosition){ + if (basDevpPosition.getDevRegion()==0){ + continue; + } + if (!devRegions.contains(basDevpPosition.getDevRegion())){ + devRegions.add(basDevpPosition.getDevRegion()); + integers[basDevpPosition.getDevRegion()] = i; + i++; + List<Integer> sitePosition = new ArrayList<>(); + sitePosition.add(basDevpPosition.getDevNo()); + sitePositions.add(sitePosition); + } else { + sitePositions.get(integers[basDevpPosition.getDevRegion()]).add(basDevpPosition.getDevNo()); + } + } + return sitePositions; + } + + //閫嗗簭鎺掑垪 public static boolean devpNoSortbj(BasDevpPosition[] devpPosition,Integer souDevpNo,Integer endDevpNo){ int sou = 0; int end = 0; -- Gitblit v1.9.1