Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -1,10 +1,10 @@
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.BigStorageDTO;
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.entity.dto.*;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;

@@ -21,7 +21,9 @@
 */
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {

    List<BigStorageCageDetails> selectTask(int taskType);
    List<BigStorageCageDetails> selectFeedTask();

    List<BigStorageCageDetails> selectOutTask();

    double selectGetBoard(String plcFeedReqLine);

@@ -56,7 +58,7 @@
     *
     * @return
     */
    TemperingLayoutDTO queryTemperingOccupySlot();
    List<TemperingLayoutDTO> queryTemperingOccupySlot();

    /**
     * 获取版图每个格子的最大最小序号
@@ -67,9 +69,51 @@
     */
    List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);

    boolean TemperingGlass(String temperingLayoutId, String engineerId);
    boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence);

    List<Map<String, Object>> selectTemperingGlass();
    List<TemperingGlassCountDTO> selectTemperingGlass(int isTempering);

    void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);

    String temperingSwitch(Boolean flag);

    boolean appointTemperingEngineerId(String engineerId);

    List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();

    List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);

    String dispatchSwitch(Boolean flag);

    /**
     * 按照工程信息及钢化id(炉号)获取缺少的玻璃信息
     * @param bigStorageQueryVO
     * @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();
}