123

zhang

5 天以前 0a37b816117828dfc216d00c17724900f4bb14e3

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java

@@ -41,7 +41,7 @@
    @ResponseBody
    @PostMapping("/station/query")
    public R query(@RequestBody StationRequestParam param) {
        log.info("站点查询：{}", param);
        //log.info("站点查询：{}", param);
        List<String> staNos = param.getStaNos();
        Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
        List<StationResponseParam> list = new ArrayList<>();
@@ -56,12 +56,12 @@
            stationResponseParam = new StationResponseParam();
            stationResponseParam.setStaNo(staNo);
            stationResponseParam.setOccupied(staProtocol.isLoading());
            stationResponseParam.setInEnable((staProtocol.isInEnable() && staProtocol.getWorkNo() == 0 ? true : false));
            stationResponseParam.setOutEnable((staProtocol.isOutEnable() ? true : false));
            stationResponseParam.setInEnable(staProtocol.getAllowPut());
            stationResponseParam.setOutEnable(staProtocol.getAllowTake());
            stationResponseParam.setOnline(staProtocol.isAutoing());
            list.add(stationResponseParam);
        }
        log.info("站点查询：{}", list);
        //log.info("站点查询：{}", list);
        return R.ok(list);
    }