From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 9c5ad4f..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
@@ -3,14 +3,17 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.bigstorage.entity.BigStorageCageDetails;
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
@@ -18,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);
@@ -41,5 +46,36 @@
*/
BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo);
- TemperingLayoutDTO temperingIsAll();
+ /**
+ * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAll();
+
+ /**
+ * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲�
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> queryTemperingOccupySlot();
+
+ /**
+ * 鑾峰彇鐗堝浘姣忎釜鏍煎瓙鐨勬渶澶ф渶灏忓簭鍙�
+ *
+ * @param engineerId
+ * @param temperingLayoutId
+ * @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