From ec4752a2780a1336bbdca510e6888423a794c16d Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 02 八月 2024 09:23:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java index e3368d3..0830e6b 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java @@ -2,16 +2,42 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.downglassinfo.entity.DownGlassInfo; +import com.mes.downworkstation.entity.dto.DownGlassInfoDTO; + +import java.util.List; public interface DownGlassInfoService extends IService<DownGlassInfo> { + /** + * @param flowCardId + * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙� + */ + Integer getMaxSequenceByFlowCardId(String flowCardId, int layer); - - Integer getMaxSequenceByFlowCardId(String flowCardId); + /** + * @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅 + */ void insertDownGlassInfo(DownGlassInfo downGlassInfo); + DownGlassInfoDTO queryDownGlassMaxLayer(String flowCardId); + Integer queryMaxSequence(String flowCardId, int layer); + /** + * 鑾峰彇鏋跺瓙缁戝畾 娴佺▼鍗$殑鐜荤拑淇℃伅锛堝凡钀芥灦/鏈惤鏋讹級 + * + * @param isDownload true/false + * @return + */ + List<DownGlassInfoDTO> queryWorkStationIsIn(Boolean isDownload); + + /** + * 鐢熸垚鍑虹墖浠诲姟 + * + * @param glassId + * @return + */ + boolean generateOutGlassTask(String glassId); } -- Gitblit v1.8.0