From 36d59c25121e2b7f270d980463be5b455e372d2b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 十二月 2024 16:24:25 +0800
Subject: [PATCH] 修复玻璃id替换与预排格子冲突的bug
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index d0d52d2..8daa7b7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -5,13 +5,15 @@
import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -19,15 +21,17 @@
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
- List<BigStorageCageDetails> selectTask(int taskType);
+ List<BigStorageCageDetails> selectFeedTask();
+
+ List<BigStorageCageDetails> selectOutTask();
double selectGetBoard(String plcFeedReqLine);
void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
- void damageBigStorageCageDetails(String glassId);
+ void damageBigStorageCageDetails(String glassId, int status);
- BigStorageCageDetails selectBigStorageCageDetails(String glassId);
+ List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId);
void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
@@ -47,14 +51,14 @@
*
* @return
*/
- TemperingLayoutDTO temperingIsAll();
+ List<TemperingLayoutDTO> temperingIsAll();
/**
* 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲�
*
* @return
*/
- TemperingLayoutDTO queryTemperingOccupySlot();
+ List<TemperingLayoutDTO> queryTemperingOccupySlot();
/**
* 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
@@ -64,4 +68,14 @@
* @return
*/
List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);
+
+ boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence);
+
+ List<Map<String, Object>> selectTemperingGlass();
+
+ void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);
+
+ String temperingSwitch(Boolean flag);
+
+ void appointEngineerId(String engineerId);
}
--
Gitblit v1.8.0