From 636bd027a92d4bf669410ee550a5ca6324f72c88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 十月 2025 17:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 139 insertions(+), 3 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 7b0a0a4..2392ac2 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
@@ -1,14 +1,20 @@
package com.mes.bigstorage.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.base.entity.vo.BigStorageVO;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.*;
+import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.pp.entity.OptimizeProject;
import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
@@ -16,7 +22,137 @@
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
- List<BigStorageCageDetails> selectTask(int taskType);
+ List<BigStorageCageDetails> selectFeedTask();
- boolean selectGetBoard(GlassInfo glassInfo, String plcFeedReqLine);
+ List<BigStorageCageDetails> selectOutTask();
+
+ double selectGetBoard(String plcFeedReqLine);
+
+ void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
+
+ void damageBigStorageCageDetails(String glassId, int status);
+
+ List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId);
+
+ void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
+
+ void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
+
+ void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
+
+ /**
+ * 鏌ヨ杩涚墖鏍煎瓙淇℃伅锛氫紭鍏堝伐绋嬫渶灏戙�佸墿浣欐牸瀛愭渶澶氱殑绗煎瓙鍐呯殑鏍煎瓙
+ * @param EngineerId
+ * @param glassId
+ * @param thickness
+ * @return
+ */
+ BigStorageDTO queryTargetSlot(String EngineerId, String glassId, int thickness);
+
+ /**
+ * 鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙淇℃伅
+ *
+ * @param glassInfo
+ */
+ BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo);
+
+ /**
+ * 鎸囧畾宸ョ▼鐨勭増鍥炬槸鍚﹀埌榻�
+ * @param engineerId
+ * @param temperingLayoutId
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAllByTemperingLayoutId(String engineerId, Integer temperingLayoutId);
+ /**
+ * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄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<TemperingGlassCountDTO> selectTemperingGlass(int isTempering);
+
+ void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);
+
+ String temperingSwitch(Boolean flag);
+
+ boolean appointTemperingEngineerId(String engineerId);
+
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot(List<Integer> deviceIdList);
+
+ List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO);
+
+ String dispatchSwitch(Boolean flag);
+
+ /**
+ * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇缂哄皯鐨勭幓鐠冧俊鎭�
+ *
+ * @param bigStorageQueryVO
+ * @return
+ */
+ List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ String bigStorageGlassDamageByGlassId(String glassId);
+
+ /**
+ * 鎸夌収鏍煎瓙鍙锋洿鏂拌鎯呰〃鍐呯殑鏍煎瓙瀵瑰簲鐨勮澶噄d
+ *
+ * @param slotList
+ */
+ void updateDeviceIdBySlot(List<Integer> slotList);
+
+ /**
+ * 鎸夌収宸ョ▼淇℃伅鍙婇挗鍖杋d(鐐夊彿)鑾峰彇瀹為檯绗煎唴鐨勭幓鐠冧俊鎭�
+ *
+ * @param bigStorageQueryVO
+ * @return
+ */
+ List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ Map<Integer, List<BigStorageVO>> querybigStorageCageDetail();
+
+ /**
+ * 鍙栨秷閽㈠寲浠诲姟
+ *
+ * @return
+ */
+ boolean cancelTemperingTask();
+
+
+ /**
+ * 鏌ヨ宸ョ▼寰呮帓搴忎俊鎭�
+ * @return
+ */
+ List<BigStorageCageDetails> queryEngineer();
+
+ /**
+ * 鏌ヨ4鍙风鍙線5-6鍙风涓嶆弧鏍煎嵈婊¤冻涓埆鐨勮皟搴�
+ * @return
+ */
+ List<BigStorageCageDetails> queryNeedDispatch();
+
+ BigStorageSlotDTO queryNeedDispatchSlotBySequence();
+ /**
+ * 鏌ヨ閽㈠寲鎺掍骇椤哄簭
+ * @return OptimizeProject 閽㈠寲鎺掍骇椤哄簭
+ */
+ List<OptimizeProject> queryTemperingOrder();
}
--
Gitblit v1.8.0