#

yxFwq

2025-01-02 6b09ae784e33e7abd33ac480a819d961d289bdff

#

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -120,7 +120,7 @@
            vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setLoading(crnProtocol.getLoaded()==1?"有物":"无物");  //  有物
            if (crnProtocol.getCrnNo()>=3 && crnProtocol.getCrnNo()<=5){
            if (!Cools.isEmpty(crnProtocol.getCrnNo()) && crnProtocol.getCrnNo()>=3 && crnProtocol.getCrnNo()<=5){
                vo.setStatus(crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE)? crnProtocol.getStatusTypeTwo().desc:crnProtocol.getStatusType().desc);     //  状态
                vo.setLoading(crnProtocol.getLoaded()==0? crnProtocol.getLoadedTwo()==1?"有物":"无物" : "有物");  //  有物
            }

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

@@ -8045,6 +8045,7 @@
                                                    log.error("穿梭车Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},穿梭车数据={},sign={}",
                                                            wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                                }
                                                Thread.sleep(500);
                                                return true;
                                            }
                                        }