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/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index 1327452..a5a3a3c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -1,11 +1,13 @@
package com.mes.downstorage.service;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
import java.util.Map;
-public interface DownStorageCageDetailsService {
+public interface DownStorageCageDetailsService extends MPJBaseService<DownStorageCageDetails> {
/**
* @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
*/
@@ -44,11 +46,37 @@
* @param end
* @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 ");
*/
- List<DownStorageCageDetails> CacheOut(int start, int end);
+
/**
- * @return 鏌ヨ绌烘牸瀛�
+ * @return 鍑虹墖
*/
- // List<DownStorageCageDetails> selectCacheEmpty2();
+ List<DownStorageCageDetails> CacheOut1(int start, int end);
+
+
+ /**
+ * @param start
+ * @param end
+ * @return 鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗�
+ */
+ List<DownStorageCageDetails> CacheOut2(int start, int end);
+// /**
+// * @return 鐩撮�氭煡璇�
+// */
+// List<GlassInfo> DirectConnection();
+
+ /**
+ * @return 鐩撮�氭煡璇�
+ */
+ boolean DirectConnection(GlassInfo glassInfo);
+
+ String getGlassInfoMaxCount(String glassId);
+
+ /**
+ * @param glassId
+ * @param ControlsId
+ * @return 鐮存崯
+ */
+ boolean identWorn(String glassId, int ControlsId);
}
--
Gitblit v1.8.0