Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -1,6 +1,7 @@
package com.mes.bigstorage.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.base.entity.vo.BigStorageVO;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.*;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
@@ -76,7 +77,7 @@

    String temperingSwitch(Boolean flag);

    void appointEngineerId(String engineerId);
    boolean appointTemperingEngineerId(String engineerId);

    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();

@@ -90,4 +91,29 @@
     * @return
     */
    List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO);

    String bigStorageGlassDamageByGlassId(String glassId);

    /**
     * 按照格子号更新详情表内的格子对应的设备id
     * @param slotList
     */
    void updateDeviceIdBySlot(List<Integer> slotList);

    /**
     * 按照工程信息及钢化id(炉号)获取实际笼内的玻璃信息
     *
     * @param bigStorageQueryVO
     * @return
     */
    List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO);

    Map<Integer, List<BigStorageVO>> querybigStorageCageDetail();

    /**
     * 取消钢化任务
     *
     * @return
     */
    boolean cancelTemperingTask();
}