#

lsh

2024-05-26 5989fd098fea045da7a3612d2c9b0da38b2d1d27

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

@@ -1459,7 +1459,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.crnStnToLoc1(crn, crnProtocol,1); //  入库
                            }
@@ -1473,7 +1473,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.locToCrnStn1(crn, crnProtocol,1); //  出库
                            }
@@ -1491,7 +1491,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.locToCrnStn1(crn, crnProtocol,1); //  出库
                            }
@@ -1505,7 +1505,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.crnStnToLoc1(crn, crnProtocol,1); //  入库
                            }
@@ -1572,7 +1572,7 @@
                                    this.crnStnToLoc1(crn, crnProtocol, sign[1]); //  入库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("O");
                        } else if (basCrnp.getOutEnable().equals("Y")) {
@@ -1583,7 +1583,7 @@
                                    this.locToCrnStn1(crn, crnProtocol, sign[1]); //  出库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("I");
                        }
@@ -1598,7 +1598,7 @@
                                    this.locToCrnStn1(crn, crnProtocol, sign[1]); //  出库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("I");
                        } else if (basCrnp.getInEnable().equals("Y")) {
@@ -1609,7 +1609,7 @@
                                    this.crnStnToLoc1(crn, crnProtocol, sign[1]); //  入库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("O");
                        }
@@ -2099,7 +2099,7 @@
                continue;
            }
            if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
                log.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
                log.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", locMast.getLocNo(), locMast.getLocSts());
                continue;
            }

@@ -2893,6 +2893,9 @@
     */
    public synchronized void storeFinishedTwo() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            if (crn.getId()<3 || crn.getId()>5){
                continue;
            }
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -4725,6 +4728,8 @@
                        case 6:////提升
//                            signWork = qwe();
                            break;
                        case 7:////位移
                            break;
                        default:
                            break;
                    }
@@ -4747,6 +4752,8 @@
                                break;
                            case 6:////提升
//                            signWork = rgvRunWrkMastEmptyStaPut();
                                break;
                            case 7:////位移
                                break;
                            default:
                                break;
@@ -5465,6 +5472,7 @@
     * */
    public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd){
        if (true){
            basRgvMapMapper.updateById(basRgvMapCurrent);
            return true;
        }

@@ -5490,4 +5498,11 @@
        }
    }

    /**
     * 入出库  ===>>  小车作业下发
     */
    public synchronized boolean steIoExecute(Integer sign) {
        return false;
    }

}