From dbbf0c051ef05480a0becee07974b80e32b1cb8f Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 20 五月 2025 11:38:31 +0800 Subject: [PATCH] 提交阿尔及及利亚项目改动 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 6 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 d29f855..098362d 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 @@ -1,10 +1,10 @@ package com.mes.bigstorage.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.mes.base.entity.vo.BigStorageVO; 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; @@ -21,7 +21,9 @@ */ public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> { - List<BigStorageCageDetails> selectTask(int taskType); + List<BigStorageCageDetails> selectFeedTask(); + + List<BigStorageCageDetails> selectOutTask(); double selectGetBoard(String plcFeedReqLine); @@ -67,11 +69,51 @@ */ 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); + + boolean appointTemperingEngineerId(String engineerId); + + List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(); + + List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO); + + String dispatchSwitch(Boolean flag); + + /** + * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭� + * @param bigStorageQueryVO + * @return + */ + List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO); + + String bigStorageGlassDamageByGlassId(String glassId); + + /** + * 鎸夌収鏍煎瓙鍙锋洿鏂拌鎯呰〃鍐呯殑鏍煎瓙瀵瑰簲鐨勮澶噄d + * @param slotList + */ + void updateDeviceIdBySlot(List<Integer> slotList); + + /** + * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇瀹為檯绗煎唴鐨勭幓鐠冧俊鎭� + * + * @param bigStorageQueryVO + * @return + */ + List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO); + + Map<Integer, List<BigStorageVO>> querybigStorageCageDetail(); + + /** + * 鍙栨秷閽㈠寲浠诲姟 + * + * @return + */ + boolean cancelTemperingTask(); } -- Gitblit v1.8.0