Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;

import java.util.List;
@@ -33,7 +34,15 @@
     * @param isDownload true/false
     * @return
     */
    List<DownGlassInfoDTO> queryWorkStationIsIn(Boolean isDownload);
    List<DownGlassInfoDTO> queryWorkStationIsIn(List<Integer> workList, Boolean isDownload);

    /**
     * 获取指定架子已绑定流程卡的架子未落玻璃的数据信息
     *
     * @param workList 指定的架子号
     * @return
     */
    List<DownGlassInfoDTO> queryWorkStationFlowCard(List<Integer> workList);

    /**
     * 生成出片任务
@@ -43,7 +52,34 @@
     */
    boolean generateOutGlassTask(String glassId);

    /**
     * 设置架子定时任务查询条件
     *
     * @param request
     * @return
     */
    String setDownGlassInfoRequest(DownGlassInfoRequest request);

    /**
     * 流程卡打印查询
     *
     * @param downGlassInfo
     * @return
     */
    List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo);

    /**
     * 工位是否满架查询
     *
     * @return
     */
    List<DownWorkstation> queryWorkStationIsFull();

    /**
     * 标签打印查询
     *
     * @param downGlassInfo
     * @return
     */
    List<Map<String, Object>> downGlassLabelPrint(DownGlassInfo downGlassInfo);
}