Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

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

@@ -167,7 +167,11 @@
                            }
                            if(agvWrkMast.getIoType() == 53){
                                AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                                agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                                if(Cools.isEmpty(agvLocDetl)){
                                    agvWrkDetl.setVolume(0.0);
                                }else {
                                    agvWrkDetl.setVolume(agvLocDetl.getAnfme());
                                }
                            }
                        }