From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index a9d0721..cd22d48 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -19,15 +19,12 @@
/**
* 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ * flag :鏄惁涓虹洿閫�
+ *
* @return
*/
- EdgStorageCage selectNearestEmpty(int currentSlot);
+ EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
- /**
- * 鏌ヨ绗煎唴绌烘牸
- * @return
- */
- List<EdgStorageCage> selectCacheEmpty();
/**
* 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
@@ -43,10 +40,19 @@
/**
* 淇敼鐞嗙墖绗间俊鎭�
+ *
* @param edgStorageCage
* @return
*/
boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
+ /**
+ * 鏇存柊鐞嗙墖绗艰鎯呬俊鎭�
+ *
+ * @param edgStorageCageId
+ * @param edgStorageCageDetails
+ * @return
+ */
boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails);
+
}
--
Gitblit v1.8.0