From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 18 十二月 2024 11:44:07 +0800 Subject: [PATCH] 1、大理片笼进出片任务新增限制:进片玻璃数大于可用格子时,不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 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 83a601d..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 @@ -2,9 +2,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.bigstorage.entity.BigStorageCageDetails; -import com.mes.bigstorage.entity.BigStorageDTO; -import com.mes.bigstorage.entity.dto.SlotSequenceDTO; -import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; +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,11 +68,26 @@ */ List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId); - boolean temperingGlass(String temperingLayoutId, String engineerId); + 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); String temperingSwitch(Boolean flag); + + void appointEngineerId(String engineerId); + + List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(); + + List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO); + + String dispatchSwitch(Boolean flag); + + /** + * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭� + * @param bigStorageQueryVO + * @return + */ + List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO); } -- Gitblit v1.8.0