From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
index d5e380f..68793aa 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -1,8 +1,14 @@
package com.mes.bigstorage.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.base.entity.vo.BigStorageVO;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import feign.Param;
+import com.mes.bigstorage.entity.dto.*;
+import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
@@ -13,6 +19,42 @@
* @author zhoush
* @since 2024-03-27
*/
-public interface BigStorageCageDetailsMapper extends BaseMapper<BigStorageCageDetails> {
+public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> {
+ /**
+ * 鑾峰彇閽㈠寲鐗堝浘宸茬粡鍒伴綈鐨勫伐绋嬪彿鍙婄増鍥緄d
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> temperingIsAll();
+
+ /**
+ * 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲�
+ *
+ * @return
+ */
+ List<TemperingLayoutDTO> queryTemperingOccupySlot(@Param(value = "count") int count);
+
+
+ List<SlotSequenceDTO> queryGlassMaxAndMin(@Param(value = "engineerId") String engineerId, @Param(value = "temperingLayoutId") Integer temperingLayoutId);
+
+ /**
+ * 鎸夌収鐜荤拑id鍜岀洰鏍囨牸瀛愭洿鏂扮鍐呯幓鐠冧俊鎭�
+ *
+ * @param glassList
+ * @param state
+ */
+ void updateBySlot(@Param(value = "list") List<UpdateBigStorageCageDTO> glassList, @Param(value = "state") int state);
+
+ List<TemperingGlassCountDTO> selectTemperingGlassCount(int isTempering);
+
+ List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot();
+
+ List<BigStorageSequenceDTO> queryNeedDispatchSlot(BigStorageRelationDTO bigStorageRelationDTO);
+
+ List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO);
+
+ void updateDeviceIdBySlot(@Param("list") List<Integer> slotList);
+
+ List<BigStorageVO> querybigStorageCageDetail();
}
--
Gitblit v1.8.0