*

L

5 天以前 12ef5e75adbba166b4c6fdaf4b1ea624dc30b22b

*

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

@@ -3796,7 +3796,7 @@
                        case 5:////满取
                            signWork = rgvRunWrkMastEmptyStaTakeFull(rgvSlave);
                            break;
                        case 6:////提升
                        case 6:////提升4 移动
//                            signWork = qwe();
                            signWork = rgvRunWrkMastMove(rgvSlave);
                            break;
@@ -4022,7 +4022,7 @@
                    if (!basDevp.getAutoing().equals("Y")){
                        continue;
                    }
                    if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                    if (basDevp.getDevNo()>119 && basDevp.getDevNo()<122){
                        if (basDevp.getEmptyMk().equals("Y")){
                            continue;
                        }

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -130,15 +130,6 @@
    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        connectDev = this.connect();
        while(!connectDev){
            try {
                connectDev = this.connect();
                Thread.sleep(100);
            } catch (Exception e){

            }
        }

        // 启动线程自动重连
        new Thread(this::devConnect).start();
@@ -155,6 +146,7 @@
     * 初始化站点状态
     */
    private void initSite() {
        connectDev = false;
        try{
            ArrayList<Integer> staNos = getStaNo();
            // 站点编号
@@ -218,7 +210,7 @@
                        connectDev = this.connect();
                        Thread.sleep(100L);
                    } catch (Exception e){

                        initSite();
                    }
                }
            } catch (Exception e) {