From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 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 2f0ae66..d412b1d 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
@@ -29,7 +29,6 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.pp.entity.OptimizeProject;
import com.mes.sysconfig.entity.SysConfig;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -548,8 +547,8 @@
}
@Override
- public List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot() {
- return baseMapper.queryIsAllNeedDispatchVirtualSlot();
+ public List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList) {
+ return baseMapper.queryIsAllNeedDispatchVirtualSlot(deviceIdList);
}
@Override
@@ -578,4 +577,14 @@
.eq("state", 100);
return this.list(wrapper);
}
+
+ @Override
+ public List<BigStorageCageDetails> queryNeedDispatch() {
+ return baseMapper.queryNeedDispatch();
+ }
+
+ @Override
+ public BigStorageSlotDTO queryNeedDispatchSlotBySequence() {
+ return baseMapper.queryNeedDispatchSlotBySequence();
+ }
}
--
Gitblit v1.8.0