#

luxiaotao1123

2022-12-01 504ee622ba68ca942d84de91c8094779617e981f

#

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -61,4 +61,6 @@
    List<String> getDemoNextLoc(Integer crnNo);

    Boolean isShuttle(String locNo);

    Integer getOutCrnNo(LocMast locMast);
}

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

@@ -77,4 +77,17 @@
        return Boolean.FALSE;
    }

    @Override
    public Integer getOutCrnNo(LocMast locMast) {
        int row = Utils.getRow(locMast.getLocNo());
        if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
            return 1;
        }
        if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
            return 3;
        } else {
            return locMast.getCrnNo();
        }
    }

}

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

@@ -1854,6 +1854,9 @@
                            Date now = new Date();
                            wrkMast.setCrnEndTime(now);
                            wrkMast.setModiTime(now);
                            LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                            Integer outCrnNo = locMastService.getOutCrnNo(locMast);
                            wrkMast.setCrnNo(outCrnNo);
                            // 修改成功后复位堆垛机
                            if (wrkMastMapper.updateById(wrkMast) > 0) {
                                // 堆垛机复位