From bb37f664476c01aefd93dd9b8856851f11d4d3cf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 15 七月 2024 08:48:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index 5530fb5..39639cb 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -48,7 +48,7 @@
private DownStorageCageDetailsMapper downStorageCageDetailsMapper;
@Override
- public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, String taskType) {
+ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
@@ -60,7 +60,7 @@
}
@Override
- public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, String taskType) {
+ public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, Integer taskType) {
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
@@ -92,7 +92,6 @@
JoinWrappers.lambda(DownStorageCage.class)
.selectAll(DownStorageCage.class)
.leftJoin(DownStorageCageDetails.class, on -> on
- .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
.eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot)
.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN))
.isNull(DownStorageCageDetails::getSlot)
@@ -106,6 +105,7 @@
}
return emptyList.get(0);
}
+/*
@Override
public List<DownStorageCageDetails> selectCacheMax() {
@@ -125,6 +125,7 @@
);
}
+*/
@Override
--
Gitblit v1.8.0