From faebd4059dc00b516e40190ab386d81073b75345 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 18 六月 2024 14:00:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 2b18a23..3d204b7 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,12 +1,12 @@
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.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,14 +16,17 @@
* @author zhoush
* @since 2024-03-27
*/
-public interface BigStorageCageService extends IService<BigStorageCage> {
+public interface BigStorageCageService extends MPJBaseService<BigStorageCage> {
- void updateRemainWidth(int Slot);
+ void updateRemainWidth(int slot);
BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
boolean outGlass();
- List<BigStorageCage> querybigStorageCageDetail();
+ List<BigStorageCage> querybigStorageCageDetail(int deviceId);
+ List<Map<String, Object>> selectBigStorageCageUsage();
+
+ void updateStorageCageDisabled(int slot,int enableState);
}
--
Gitblit v1.8.0