#

lsh

2024-05-23 21b1fd74f475efd91d16a815464debab860a97a2

 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");
                        }
@@ -4725,6 +4725,8 @@
                        case 6:////提升
//                            signWork = qwe();
                            break;
                        case 7:////位移
                            break;
                        default:
                            break;
                    }
@@ -4747,6 +4749,8 @@
                                break;
                            case 6:////提升
//                            signWork = rgvRunWrkMastEmptyStaPut();
                                break;
                            case 7:////位移
                                break;
                            default:
                                break;
@@ -5464,6 +5468,10 @@
     * 小车地图更新  更新锁
     * */
    public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd){
        if (true){
            basRgvMapMapper.updateById(basRgvMapCurrent);
            return true;
        }

//        List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
        //更新当前小车锁