*

L

5 天以前 12ef5e75adbba166b4c6fdaf4b1ea624dc30b22b

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

@@ -2270,7 +2270,7 @@
                        param.setLocType1(locTypeDto.getLocType1());
                        String path = "/rpc/pakin/loc/v1";

                        if (staProtocol.getStaNo()==1908){
                        if (emptyInSta.getStaNo()==1908){
                            param.setRgvNo(1);
                            path = "/rpc/pakin/empty/loc/v1";
                        }
@@ -2284,7 +2284,7 @@
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                            Integer staNo = dto.getStaNo();
                            if (staProtocol.getStaNo()==1908){
                            if (emptyInSta.getStaNo()==1908){
                                staNo = 1907;
                            }
                            // 更新站点信息 且 下发plc命令
@@ -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;
                        }