1、中空定时任务优化 2、中空理片笼/大理片笼详情界面由按笼子显示改为全部显示（厂长提出）

zhoushihao

2025-03-17 02ebc36f541d1ff39bdd4e9a65672ab58e84c5d8

1、中空定时任务优化
2、中空理片笼/大理片笼详情界面由按笼子显示改为全部显示（厂长提出）

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java

@@ -226,7 +226,7 @@
                        .like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())
                        .like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(BigStorageCage::getDeviceId, query.getDeviceId())
//                .eq(BigStorageCage::getDeviceId, query.getDeviceId())
                .orderByAsc(BigStorageCage::getDeviceId)
                .orderByAsc(BigStorageCage::getSlot);
        return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java

@@ -49,7 +49,7 @@
                        .like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
                        .like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
                        .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
//                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
                .orderByAsc(HollowBigStorageCage::getDeviceId)
                .orderByAsc(HollowBigStorageCage::getSlot);
        return baseMapper.selectJoinList(HollowBigStorageAndDetailsDTO.class, wrapper);

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -798,7 +798,7 @@
        }
        Assert.isFalse(CollectionUtil.isEmpty(templist), "未获取出片数据，结束出片任务");
        log.info("获取出片任务数据{}条，执行保存", templist.size());
        List<T> baseInfoList = new ArrayList<>();
        List<T> baseInfoList = templist;
        if (1 != isForce) {
            if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
                //校验防止小于等于总层数玻璃片序不匹配的问题，该问题多出现在大片玻璃，3层