Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-27 636bd027a92d4bf669410ee550a5ca6324f72c88

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

@@ -7,6 +7,7 @@
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.pp.entity.OptimizeProject;

import java.util.List;
import java.util.Map;
@@ -95,7 +96,7 @@

    boolean appointTemperingEngineerId(String engineerId);

    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList);

    List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);

@@ -134,4 +135,24 @@
     * @return
     */
    boolean cancelTemperingTask();


    /**
     * 查询工程待排序信息
     * @return
     */
    List<BigStorageCageDetails> queryEngineer();

    /**
     * 查询4号笼可往5-6号笼不满格却满足个别的调度
     * @return
     */
    List<BigStorageCageDetails> queryNeedDispatch();

    BigStorageSlotDTO queryNeedDispatchSlotBySequence();
    /**
     * 查询钢化排产顺序
     * @return OptimizeProject 钢化排产顺序
     */
    List<OptimizeProject> queryTemperingOrder();
}