#

luxiaotao1123

2022-12-05 7896b4049af92b42c03f347f83cc8f686f3265b2

#

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

@@ -777,8 +777,9 @@
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 {} => 7.吊车入库中 失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
                        } else {
                            return true;
                        }
                        return true;
                    }
                }
            } else {
@@ -793,11 +794,13 @@
                            // 没有其他任务
                            if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
                                this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
                                return true;
                            }
                        }
                        // 小车搬走
                        if (wrkMast.getWrkSts() == 3L) {
                            this.carMoveOut(wrkMast, steNo, crnProtocol);
                            return true;
                        }
                        // 没有小车
                    } else {
@@ -834,8 +837,9 @@
                                wrkMast.setModiTime(now);
                                if (wrkMastMapper.updateById(wrkMast) == 0) {
                                    log.error("修改工作档状态 {} => 7.吊车入库中 失败！！，工作号={}", wrkMast.getWrkSts$(), wrkMast.getWrkNo());
                                } else {
                                    return true;
                                }
                                return true;
                            }
                        }

@@ -852,6 +856,8 @@
                            // 没有其他任务
                            if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
                                this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
                            } else {
                                return true;
                            }
                        }
                        // 堆垛机将货放至小车上 3.小车待搬（小车不用搬运，已经在当前组库位） / 6.小车待入  ===>> 7.吊车入库中
@@ -888,8 +894,9 @@
                                    wrkMast.setModiTime(now);
                                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                                        log.error("修改工作档状态 3.小车待搬/6.小车待入 => 7.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                                    } else {
                                        return true;
                                    }
                                    return true;
                                }
                            }
                        }
@@ -903,12 +910,14 @@
                                if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
                                    // 让小车等待搬运待续
                                    this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
                                    return true;
                                }
                            }
                        }
                        // 堆垛机搬运小车
                        if (wrkMast.getWrkSts() == 3L) {
                            this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
                            return true;
                        }
                    }
                }
@@ -921,7 +930,7 @@
    /**
     * 出库  ===>>  库位到堆垛机站
     */
    public boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
    public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
@@ -1035,8 +1044,9 @@
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                        } else {
                            return true;
                        }
                        break;
                    }

                } else {
@@ -1070,8 +1080,9 @@
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                log.error("修改工作档状态 11.生成出库ID => 16.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                            } else {
                                return true;
                            }
                            return true;
                        }
                    // 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
                    } else {
@@ -1111,6 +1122,8 @@
                                        wrkMast.setCrnNo(outCrnNo);
                                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                                            log.error("修改工作档状态 11.生成出库ID => 14.小车搬出库 失败！！，工作号={}", wrkMast.getWrkNo());
                                        } else {
                                            return true;
                                        }
                                    }
                                }
@@ -1143,8 +1156,9 @@
                                    wrkMast.setModiTime(now);
                                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                                        log.error("修改工作档状态 15.等待吊车 => 16.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                                    } else {
                                        return true;
                                    }
                                    return true;
                                }
                            }

@@ -1158,12 +1172,14 @@
                                    if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
                                        // 让小车等待搬运待续
                                        this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
                                        return true;
                                    }
                                }
                            }
                            // 堆垛机搬运小车
                            if (wrkMast.getWrkSts() == 12L) {
                                this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
                                return true;
                            }
                        }
                    }