From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 27 十一月 2024 09:46:15 +0800 Subject: [PATCH] 1、大理片笼新增进笼规则,计算本工程下所有玻璃的虚拟格子信息,按照虚拟格子,匹配笼内的实际格子,进笼之后查看格子是否有到齐的,执行调度任务 2、卧理修改任务执行顺序,移除捕获异常操作 3、不覆盖原有逻辑,新增opc任务,避免任务重复执行报错 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java index ee80460..1f82904 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java @@ -8,9 +8,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; -import com.mes.bigstorage.entity.BigStorageDTO; -import com.mes.bigstorage.entity.dto.SlotSequenceDTO; -import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; +import com.mes.bigstorage.entity.dto.*; import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; @@ -432,6 +430,12 @@ } @Override + public String dispatchSwitch(Boolean flag) { + redisUtil.setCacheObject("dispatchSwitch", flag); + return "success"; + } + + @Override public String temperingSwitch(Boolean flag) { redisUtil.setCacheObject("temperingSwitch", flag); return "success"; @@ -441,4 +445,14 @@ public void appointEngineerId(String engineerId) { redisUtil.setCacheObject("temperingengineerId", engineerId); } + + @Override + public List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot() { + return baseMapper.queryIsAllNeedDispatchVirtualSlot(); + } + + @Override + public List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO) { + return baseMapper.queryNeedDispatchSlot(bigStorageRelationDTO); + } } -- Gitblit v1.8.0