From 566afa95de99a2f7cc3b9c928a6c4448865f8af5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 七月 2024 18:09:03 +0800
Subject: [PATCH] 根据现场变动情况修改接口，添加当前值班表
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 72fc607..db3ca3a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -222,7 +222,8 @@
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper=new LambdaQueryWrapper();
bigStorageCageDetailsWrapper
.eq(BigStorageCageDetails::getSlot,slot)
- .ne(BigStorageCageDetails::getState,Const.BIG_STORAGE_OUTSIDE);
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL);
List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
@@ -244,7 +245,10 @@
public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper =new LambdaQueryWrapper<>();
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper.lt(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUTSIDE);
+ bigStorageCageDetailsWrapper
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .or()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);
if(deviceId!=0){
bigStorageCageWrapper.eq(BigStorageCage::getDeviceId,deviceId);
bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId,deviceId);
--
Gitblit v1.8.0