Merge remote-tracking branch 'origin/master'

zhoushihao

2025-04-10 ca48f8c87bb927c7be7f02b7eaaf71996e759bff

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java

@@ -193,8 +193,8 @@
    }

    @Override
    public String getGlassInfoMaxCount(String glassId) {
        DownStorageCageDetails glassInfoMaxCount = baseMapper.getGlassInfoMaxCount();
    public String getGlassInfoMaxCount(String glassId, List<Integer> workList) {
        DownStorageCageDetails glassInfoMaxCount = baseMapper.getGlassInfoMaxCount(workList);
        return null == glassInfoMaxCount ? glassId : glassInfoMaxCount.getGlassId();
    }