*

lsh

2025-03-01 5180133179d3589a1c64cdf0a1431990b80f1bc2

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -77,7 +77,7 @@
            List<WcsTaskListParam> wcsTaskListParamList = new ArrayList<>();
            List<WcsRgvListParam> wcsRgvListParamList = new ArrayList<>();
            List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<>());
            List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",false));
            List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",true));

            for (WrkMast wrkMast : wrkMastList){
                WcsTaskListParam wcsTaskListParam = new WcsTaskListParam(wrkMast);
@@ -96,7 +96,8 @@
                WcsRgvListParam wcsRgvListParam = new WcsRgvListParam();
                wcsRgvListParam.setRgvNo(rgv.getId().toString());
                wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
                wcsRgvListParam.setStatus(rgvProtocol.statusType.desc);
                wcsRgvListParam.setStatus(rgvProtocol.statusType.id);
                wcsRgvListParam.setCurrPos(rgvProtocol.RgvPos);
                wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString());
                List<String> arrayList = new ArrayList<>();
                if (rgvProtocol.getAlarm()!=0){