Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

12 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java

@@ -55,7 +55,7 @@

            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null == agvDetail) { continue; }
            Code currCode = codeService.getById(agvDetail.getCode());
            Code currCode = codeService.getCacheById(agvDetail.getCode());
            if (null == currCode) { continue; }
            vo.synPosition(currCode.getX(), 0, currCode.getY());

@@ -136,9 +136,9 @@
    /**
     * SELECT
     * ml.loc_no,
     * ml.row,
     * ml.bay,
     * ml.lev,
     * ml.row_no,
     * ml.bay_no,
     * ml.lev_no,
     * ml.loc_sts AS locStsEl
     * FROM man_loc ml
     * LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -174,9 +174,9 @@
     *
     * SELECT
     * ml.loc_no,
     * ml.row,
     * ml.bay,
     * ml.lev,
     * ml.row_no,
     * ml.bay_no,
     * ml.lev_no,
     * ml.loc_sts AS locStsEl
     * FROM man_loc ml
     * LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -218,9 +218,9 @@
        for (Loc loc : locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()))) {
            DigitalStockVo vo = new DigitalStockVo();
            vo.setLocNo(loc.getLocNo());
            vo.setRow(loc.getRow());
            vo.setBay(loc.getBay());
            vo.setLev(loc.getLev());
            vo.setRowNo(loc.getRowNo());
            vo.setBayNo(loc.getBayNo());
            vo.setLevNo(loc.getLevNo());
            vo.setLocSts(loc.getLocStsEl());
            voList.add(vo);
        }
@@ -246,9 +246,9 @@
            if (action.getActionSts().equals(ActionStsType.FINISH.val())) {
                DigitalStockVo vo = new DigitalStockVo();
                vo.setLocNo(loc.getLocNo());
                vo.setRow(loc.getRow());
                vo.setBay(loc.getBay());
                vo.setLev(loc.getLev());
                vo.setRowNo(loc.getRowNo());
                vo.setBayNo(loc.getBayNo());
                vo.setLevNo(loc.getLevNo());
                vo.setLocSts(loc.getLocStsEl());
                voList.add(vo);
            }
@@ -275,9 +275,9 @@
            if (!action.getActionSts().equals(ActionStsType.FINISH.val())) {
                DigitalStockVo vo = new DigitalStockVo();
                vo.setLocNo(loc.getLocNo());
                vo.setRow(loc.getRow());
                vo.setBay(loc.getBay());
                vo.setLev(loc.getLev());
                vo.setRowNo(loc.getRowNo());
                vo.setBayNo(loc.getBayNo());
                vo.setLevNo(loc.getLevNo());
                vo.setLocSts(loc.getLocStsEl());
                voList.add(vo);
            }