From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 09 十月 2024 15:47:59 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 85 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 77 insertions(+), 8 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 37b6795..e921817 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,15 +2,84 @@ 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; -/** - * <p> - * 鏈嶅姟绫� - * </p> - * - * @author zhoush - * @since 2024-03-27 - */ +import java.util.List; +import java.util.Map; + public interface DownGlassInfoService extends IService<DownGlassInfo> { + + /** + * @param flowCardId + * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙� + */ + Integer getMaxSequenceByFlowCardId(String flowCardId, int layer); + + /** + * @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅 + */ + void insertDownGlassInfo(DownGlassInfo downGlassInfo); + + + DownGlassInfoDTO queryDownGlassMaxLayer(String flowCardId); + + Integer queryMaxSequence(String flowCardId, int layer); + + /** + * 鑾峰彇鏋跺瓙缁戝畾 娴佺▼鍗$殑鐜荤拑淇℃伅锛堝凡钀芥灦/鏈惤鏋讹級 + * + * @param isDownload true/false + * @return + */ + List<DownGlassInfoDTO> queryWorkStationIsIn(List<Integer> workList, Boolean isDownload); + + /** + * 鑾峰彇鎸囧畾鏋跺瓙宸茬粦瀹氭祦绋嬪崱鐨勬灦瀛愭湭钀界幓鐠冪殑鏁版嵁淇℃伅 + * + * @param workList 鎸囧畾鐨勬灦瀛愬彿 + * @return + */ + List<DownGlassInfoDTO> queryWorkStationFlowCard(List<Integer> workList); + + /** + * 鐢熸垚鍑虹墖浠诲姟 + * + * @param glassId + * @return + */ + 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); } -- Gitblit v1.8.0