Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -3,7 +3,11 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.largenscreen.entity.PieChartVO;

import java.util.List;
import java.util.Map;
@@ -23,6 +27,11 @@
    BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);

    boolean outGlass();
    /**
     * 按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息
     * @return
     */
    List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query);

    List<BigStorageCage> querybigStorageCageDetailAll();

@@ -34,5 +43,11 @@

    List<Integer> queryFreeDeviceByUsed(double thickness);

    List<BigStorageSummaryDTO> selectBigStorageSummary();

    Boolean resetCage();

    List<PieChartVO> queryPieChart();

//    List<Integer> queryFreeDeviceByNotUsed(double thickness);
}