From 0533bba71d330019c5c61bee1e10f78ea2abdbcf Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 17 十二月 2024 09:06:37 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java index 74183c1..e73468b 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.dto.*; +import com.mes.bigstorage.entity.vo.BigStorageQueryVO; import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO; import com.mes.glassinfo.entity.GlassInfo; @@ -69,7 +70,7 @@ boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence); - List<Map<String, Object>> selectTemperingGlass(); + List<TemperingGlassCountDTO> selectTemperingGlass(int isTempering); void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state); @@ -82,4 +83,11 @@ List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO); String dispatchSwitch(Boolean flag); + + /** + * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭� + * @param bigStorageQueryVO + * @return + */ + List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO); } -- Gitblit v1.8.0