高频入出库模式

Junjie

2023-05-31 f7ff66dea3381b551430679272d3d756386658cb

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

@@ -789,7 +789,7 @@
                continue;
            }
            // 只有当堆垛机空闲 并且 无任务时才继续执行
            if (true || crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                // 如果最近一次是入库模式
                if (crnProtocol.getLastIo().equals("I")) {
                    if (basCrnp.getInEnable().equals("Y")) {
@@ -2936,31 +2936,6 @@
                            wrkMast.setModiTime(now);
                            // 修改成功后复位堆垛机
                            if (wrkMastMapper.updateById(wrkMast) > 0) {

//                                if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
//                                    News.error("库位移转 ===>> 转移库存明细数据失败；[源库位={}],[目标库位={}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
//                                    continue;
//                                }

//                                // 修改源库位状态 ==> O
//                                LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
//                                if (null != sourceLoc) {
//                                    sourceLoc.setLocSts("O");
//                                    sourceLoc.setModiTime(now);
//                                    if (!locMastService.updateById(sourceLoc)) {
//                                        News.error("库位移转 ===>> 修改源库位状态失败；[workNo={}],[sourceLoc={}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
//                                    }
//                                }
//                                // 修改目标库位状态 ==> F
//                                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
//                                if (locMast != null) {
//                                    locMast.setLocSts("F");
//                                    locMast.setModiTime(now);
//                                    if (!locMastService.updateById(locMast)) {
//                                        News.error("库位移转 ===>> 修改目标库位状态失败；[workNo={}],[locNo={}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
//                                    }
//                                }

                                // 堆垛机复位
                                crnThread.setResetFlag(true);
                            } else {