Merge remote-tracking branch 'origin/master'

wu

2024-08-07 dd60bcc7b38c2a19c02a20550a393987fc5a5a27

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