From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 08 八月 2024 10:14:59 +0800 Subject: [PATCH] 1、任务表中新增是否删除字段 0:未删除 1:已删除 2、磨边队列方法改造:增加设置参数接口,websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 15 ++++++++++----- 1 files changed, 10 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 5f1d50f..9ba368b 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,9 +1,8 @@ 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.glassinfo.entity.GlassInfo; import java.util.List; @@ -17,7 +16,7 @@ * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { +public interface BigStorageCageService extends MPJBaseService<BigStorageCage> { void updateRemainWidth(int slot); @@ -25,9 +24,15 @@ boolean outGlass(); - List<BigStorageCage> querybigStorageCageDetail(int deviceId); + List<BigStorageCage> querybigStorageCageDetailAll(); + + Map<Integer, List<BigStorageCage>> querybigStorageCageDetail(); List<Map<String, Object>> selectBigStorageCageUsage(); - boolean selectWidthSufficient(BigStorageCageDetails layoutSlotInfo,double width); + void updateStorageCageDisabled(int slot, int enableState); + + List<Integer> queryFreeDeviceByUsed(double thickness); + + List<Integer> queryFreeDeviceByNotUsed(double thickness); } -- Gitblit v1.8.0