hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -482,14 +482,15 @@ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY); task.setGlassIdOut(""); task.setStartCell(0); int device = tableName.equals("edg_storage_device_one_task") ? 1 : 2; EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW) .eq(EdgStorageDeviceTaskHistory::getDeviceId, device) .orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1")); int device = tableName.equals("edg_storage_device_one_task") ? 1 : 2; updateCellRemainWidth(cell, device, taskHistory); edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW) .eq(EdgStorageDeviceTaskHistory::getDeviceId, device) .set(EdgStorageDeviceTaskHistory::getTaskState, Const.GLASS_CACHE_TYPE_FINISH.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE) ); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -1,4 +1,8 @@ package com.mes.bigstorage.controller; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO; import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.utils.Result; import io.swagger.annotations.Api; @@ -33,4 +37,10 @@ return Result.build(200,"启用/禁用成功",1); } @ApiOperation("按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息") @GetMapping("/querybigStorageCageDetail") public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(BigStorageDetailsQueryVO query) { return Result.build(200, "查询成功", bigStorageCageService.querybigStorageCageDetail(query)); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/BigStorageAndDetailsDTO.java
New file @@ -0,0 +1,20 @@ package com.mes.bigstorage.entity.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @Author : zhoush * @Date: 2024/6/11 16:45 * @Description: */ @Data public class BigStorageAndDetailsDTO extends BigStorageCage { private List<BigStorageCageDetails> bigStorageCageDetails; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java
New file @@ -0,0 +1,40 @@ package com.mes.bigstorage.entity.vo; import lombok.Data; /** * @Author : zhoush * @Date: 2024/6/13 15:51 * @Description: */ @Data public class BigStorageDetailsQueryVO { /** * 设备id */ private Integer deviceId; /** * 流程卡 */ private String flowCardId; /** * 膜系 */ private String filmsId; /** *最小宽度 */ private Integer minWidth; /** *最大宽度 */ private Integer maxWidth; /** *最小高度 */ private Integer minHeight; /** *最大高度 */ private Integer maxHeight; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -3,6 +3,8 @@ import com.github.yulichang.base.MPJBaseService; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO; import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO; import com.mes.glassinfo.entity.GlassInfo; import java.util.List; @@ -23,6 +25,11 @@ BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); boolean outGlass(); /** * 按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息 * @return */ List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query); List<BigStorageCage> querybigStorageCageDetailAll();
@@ -3,11 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO; import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO; import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper; import com.mes.bigstorage.mapper.BigStorageCageMapper; import com.mes.bigstorage.service.BigStorageCageService; @@ -213,6 +216,20 @@ return false; } @Override public List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query) { MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails) .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot) .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING)) .eq(BigStorageCageDetails::getDeviceId,query.getDeviceId()) .eq(StringUtils.isNotBlank(query.getFilmsId()),BigStorageCageDetails::getFilmsId,query.getFilmsId()) .eq(StringUtils.isNotBlank(query.getFlowCardId()),BigStorageCageDetails::getFlowCardId,query.getFlowCardId()) .orderByAsc(BigStorageCage::getDeviceId) .orderByAsc(BigStorageCage::getSlot); return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper); } //计算格子剩余宽度 @Override public void updateRemainWidth(int slot) {
