From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java index d8bb16e..a4c6756 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java @@ -1,12 +1,15 @@ package com.mes.bigstorage.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; -import com.mes.glassinfo.entity.GlassInfo; +import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO; +import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO; +import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; +import java.util.Map; /** * <p> @@ -16,15 +19,32 @@ * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { +public interface BigStorageCageService extends MPJBaseService<BigStorageCage> { - void updateRemainWidth(int Slot); + void updateRemainWidth(int slot); BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); boolean outGlass(); + /** + * 鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭� + * @return + */ + List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query); - List<BigStorageCage> querybigStorageCageDetail(); + List<BigStorageCage> querybigStorageCageDetailAll(); + Map<Integer, List<BigStorageCage>> querybigStorageCageDetail(); + List<Map<String, Object>> selectBigStorageCageUsage(); + + void updateStorageCageDisabled(int slot, int enableState); + + List<Integer> queryFreeDeviceByUsed(double thickness); + + List<BigStorageSummaryDTO> selectBigStorageSummary(); + + Boolean resetCage(); + +// List<Integer> queryFreeDeviceByNotUsed(double thickness); } -- Gitblit v1.8.0