Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

zjj

2024-01-10 473bc88e44ad3e60b207012130507824cb32f04a

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

@@ -2491,7 +2491,7 @@
                // 只有当RGV空闲、自动,工位一无物//rgv可用
                if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
                        && rgvProtocol.getModeType() == RgvModeType.AUTO
                        && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
//                        && rgvProtocol.getLoaded1()==0  //现场修改：叠盘机，不满都算无物，怎么判断需要跟电控对接
                        && rgvProtocol.getTaskNo1()==0
                        && rgvProtocol.getTaskNo2()==0
                ) {