#

Administrator

2025-07-15 ea5d901601c30c331829be01982ea5ecdcc08b97

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

@@ -1386,7 +1386,18 @@

                } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                    // 此标记避免多次执行移库任务
                    if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
////                    if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
//                        wrkMast.setUpdMk("Y");
//                        wrkMast.setIoPri(14D);
//                        wrkMastMapper.updateById(wrkMast);
//                        // 生成工作档,将浅库位移转到新的库位中
//                        moveLocForDeepLoc(slave, shallowLoc);
//                        // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
////                        moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
////                    }
//                    break;
                    WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                    if (Cools.isEmpty(waitWrkMast)) {
                        wrkMast.setUpdMk("Y");
                        wrkMast.setIoPri(14D);
                        wrkMastMapper.updateById(wrkMast);
@@ -1395,7 +1406,7 @@
                        // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
//                        moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
                    }
                    continue;
                    break;
                } else if (shallowLoc.getLocSts().equals("Q")) {
                    WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
                    if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
@@ -1577,7 +1588,12 @@
     */
    public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
        Integer count = wrkMastMapper.countPakOut();

        for (WrkMast wrkMast : wrkMasts) {
            if(count > 20){ //设备上走托盘不超过30个
                continue;
            }
            // 判断堆垛机站点是否可用
            if (!crnEnabled(wrkMast)){
                continue;