wangfei
2025-04-22 e021ca7fe59647b483a8762f509cc708841cc9cf
Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
1个文件已修改
4 ■■■■ 已修改文件
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
@@ -16,6 +16,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
@@ -46,6 +48,7 @@
    @Override
    public List<HollowGlassQueueInfo> queryHollowGlassQueueInfoByLine(int cell) {
        LocalDateTime twoDaysAgo = LocalDate.now().atStartOfDay().minusDays(1);
        List<String> relationIds = this.listObjs(
                new LambdaQueryWrapper<HollowGlassQueueInfo>()
                        .lt(HollowGlassQueueInfo::getState, 1)
@@ -59,6 +62,7 @@
                        .in("relation_id", relationIds)
                        .eq("cell", cell)
                        .eq("is_pair", 1)
                        .ge("create_time", twoDaysAgo)
                        .select("width","height","flow_card_id","relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
                        .groupBy("relation_id", "hollow_sequence")
                        .orderByAsc("relation_id", "hollow_sequence")