Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-03-26 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de

 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());
                                }
                            }
                        }

@@ -268,4 +272,9 @@
        return this.baseMapper.selectAllStationCode();
    }

    @Override
    public AgvBasDevp selectByDevNo(String devNo) {
        return this.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",devNo));
    }

}