*

L

16 小时以前 1dacf2305187f5c2fb44f03b6b754c46cb73ba25

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

@@ -76,6 +76,12 @@
            List<WcsRgvListParam> wcsRgvListParamList = new ArrayList<>();
            List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<>());
            List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<BasDevpPosition>().orderBy("plc_position",true));
            if (wrkMastList == null) {
                wrkMastList = new ArrayList<>();
            }
            if (basDevpPositions == null) {
                basDevpPositions = new ArrayList<>();
            }

            for (WrkMast wrkMast : wrkMastList){
                WcsTaskListParam wcsTaskListParam = new WcsTaskListParam(wrkMast);
@@ -94,11 +100,19 @@
                WcsRgvListParam wcsRgvListParam = new WcsRgvListParam();
                wcsRgvListParam.setRgvNo(rgv.getId().toString());
                wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
                if (rgvProtocol.getStatusType() == null || rgvProtocol.getStatusType().id == null) {
                    continue;
                }
                wcsRgvListParam.setStatus(rgvProtocol.statusType.id);
                wcsRgvListParam.setCurrPos(rgvProtocol.RgvPos);
                wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString());
                if (rgvProtocol.getRgvPos() != null && !basDevpPositions.isEmpty()) {
                    Integer currSta = SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions, rgvProtocol.getRgvPos(), perimeter);
                    wcsRgvListParam.setCurrSta(currSta == null ? null : currSta.toString());
                } else {
                    wcsRgvListParam.setCurrSta(null);
                }
                List<String> arrayList = new ArrayList<>();
                if (rgvProtocol.getAlarm()!=0){
                if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm()!=0){
                    arrayList.add(rgvProtocol.getAlarm$());
                }
                wcsRgvListParam.setError(arrayList);
@@ -109,6 +123,7 @@
            wcsDataSynchronizationParam.setTimestamp(timestamp);
            return R.ok().add(wcsDataSynchronizationParam);
        } catch (Exception e){
            log.error("wcsTaskStatus接口异常, timestamp={}", timestamp, e);
            return R.error("异常").add("异常信息："+e);
        }
    }