Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2024-12-05 fd35c0ee025e8f5471acd4075af33b9f59f4d817

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