#

luxiaotao1123

2022-11-02 7ea8173892683849fee7b1ebb598c63bcc5f4f95

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

@@ -719,42 +719,37 @@
                        String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
                        LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                        // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用 直接搬！
                        switch (shallowLoc.getLocSts()) {
                            case "P":
                            case "R": {
                                WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
                                if (null == waitWrkMast) {
                                    log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                                } else {
                                    if (waitWrkMast.getWrkSts() < 17) {
                                        waitWrkMast.setIoPri(20D);
                                        waitWrkMast.setModiTime(new Date());
                                        if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                            log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                        }
                                        //20220719 Add，如果浅库位状态为P/R，工作状态为14/15,说明浅库位已经空了，可以执行入库任务
                                        continue;
                        if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
                            if (null == waitWrkMast) {
                                log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                            } else {
                                if (waitWrkMast.getWrkSts() < 17) {
                                    waitWrkMast.setIoPri(30D);
                                    waitWrkMast.setModiTime(new Date());
                                    if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                        log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                    }
                                }
                                break;
                            }
                            case "F":
                            case "D":
                                // 此标记避免多次执行移库任务
                                if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
                                    wrkMast.setUpdMk("Y");
                                    wrkMast.setIoPri(20D);
                                    wrkMastMapper.updateById(wrkMast);
                                    // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
                                    moveLocForDeepLoc(slave, shallowLoc);
                                }
                                continue;
                            case "Q": {
                                WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
                                if (null != waitWrkMast && waitWrkMast.getWrkSts() == 9) {
                                    //20220719 Add，如果浅库位状态为P/R，工作状态为14/15,说明浅库位已经空了，可以执行入库任务
                                    continue;
                                }
                                break;
                            }
                        }
                        if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                            // 此标记避免多次执行移库任务
                            if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
                                wrkMast.setUpdMk("Y");
                                wrkMast.setIoPri(20D);
                                wrkMastMapper.updateById(wrkMast);
                                // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
                                moveLocForDeepLoc(slave, shallowLoc);
                            }
                            continue;
                        }
                        if (shallowLoc.getLocSts().equals("Q")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
                            if (null != waitWrkMast && waitWrkMast.getWrkSts() == 9) {
                                continue;
                            }
                        }
                    }
@@ -2787,6 +2782,7 @@
     */
    public synchronized void steFromChargeToIdleLoc() {
        WrkCharge wrkCharge = wrkChargeService.selectWorking(null, "reset");
        if (wrkCharge == null) { return; }
        SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
        SteProtocol steProtocol = steThread.getSteProtocol();
        BasSte basSte = basSteService.selectById(wrkCharge.getSteNo());