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/mapper/BigStorageCageMapper.java | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java index bd01771..b6f1cbd 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java @@ -1,32 +1,22 @@ package com.mes.bigstorage.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.mes.bigstorage.entity.BigStorageCage; -import com.mes.bigstorage.entity.BigStorageCageDetails; -import com.mes.glassinfo.entity.GlassInfo; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> - * Mapper 鎺ュ彛 + * Mapper 鎺ュ彛 * </p> * * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageMapper extends BaseMapper<BigStorageCage> { +public interface BigStorageCageMapper extends MPJBaseMapper<BigStorageCage> { + List<Integer> queryFreeDeviceByUsed(@Param(value = "thickness") double thickness); - BigStorageCageDetails SelectEmptyFeedSlot(); - - @Update("update big_storage_cage set remain_width = #{width} where slot=#{slot}") - public void UpdateRemainWidth(int slot,int width); - - - - BigStorageCageDetails SelectOtherFeedSlot(); - - List<String> selectTemperingId(); + List<Integer> queryFreeDeviceByNotUsed(@Param(value = "thickness") double thickness); } -- Gitblit v1.8.0