Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-04-19 1bd93d6d748edfda1b95b692f7d4ce4f38363e32

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

@@ -79,7 +79,8 @@
                        .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id  and gi.flowcard_id=escd.flow_card_id ")
                        .isNotNull("escd.slot")
                        .between("dw.workstation_id", start, end)
                        .orderByDesc("gi.width, gi.height, escd.tempering_layout_id")
                        .orderByDesc("escd.width")
                        .orderByDesc("escd.height")
        );
        return list;
    }