From 093579c99049bf09ecf8e5d0f80179fde1ddc776 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 10 七月 2024 09:49:31 +0800 Subject: [PATCH] 下片:下片任务状态字段名称修改 大理片:1、扫码任务新增确认字校验:确认字为0,请求有id的情况不处理 2、新增定时任务处理进出片任务执行过程中出现破损玻璃的情况 待完成:破损表新增功能未实现 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 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 2feead5..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,6 +2,9 @@ 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> { @@ -10,7 +13,7 @@ * @param flowCardId * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙� */ - Integer getMaxSequenceByFlowCardId(String flowCardId); + Integer getMaxSequenceByFlowCardId(String flowCardId, int layer); /** * @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅 @@ -18,4 +21,23 @@ 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