From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 16 七月 2024 21:15:53 +0800 Subject: [PATCH] 1、大理片:fixbug:大理片出片逻辑修改,钢化版图是否到齐:sql逻辑问题,包含人工出片任务,造成钢化版图是否到齐需要获取已出片的玻璃,造成已出笼的玻璃会重复计算并准备生成钢化任务,但获取的玻璃信息为空,造成插入钢化表异常。且排除已出笼的钢化版图较复杂(暂不关联钢化小片表),目前解决方案:把所有到齐的钢化版图数据查出来,排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 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 24d6c4f..ab90c99 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,25 +1,34 @@ 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.bigstorage.mapper.BigStorageCageDetailsMapper; -import com.mes.bigstorage.mapper.BigStorageCageMapper; -import com.mes.uppattenusage.entity.GlassInfo; -import org.springframework.beans.factory.annotation.Autowired; +import com.mes.glassinfo.entity.GlassInfo; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.Map; /** * <p> - * 鏈嶅姟绫� + * 鏈嶅姟绫� * </p> * * @author zhoush * @since 2024-03-27 */ -public interface BigStorageCageService extends IService<BigStorageCage> { +public interface BigStorageCageService extends MPJBaseService<BigStorageCage> { + void updateRemainWidth(int slot); + + BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); + + boolean outGlass(); + + List<BigStorageCage> querybigStorageCageDetailAll(); + + Map<Integer, List<BigStorageCage>> querybigStorageCageDetail(); + + List<Map<String, Object>> selectBigStorageCageUsage(); + + void updateStorageCageDisabled(int slot, int enableState); } -- Gitblit v1.8.0