From 26caccd05881f23189bdc8cc4db892e2b789e57d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 04 九月 2025 13:47:10 +0800
Subject: [PATCH] 1、中空调整：定任务优先级可控，界面新增按钮 2、中空缺片详情报破损功能以实现
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
index b2a3218..4090163 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
@@ -1,10 +1,12 @@
package com.mes.hollow.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
import com.mes.hollow.entity.dto.HollowBigStorageDTO;
import com.mes.hollow.entity.dto.LackDetailsDTO;
+import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
@@ -22,19 +24,31 @@
*
* @return
*/
- HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, double width, double height, int totalLayer, int layer);
+ HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, Integer glassType, double width, double height, int totalLayer, int layer);
/**
* 鐢熸垚涓┖鐜荤拑淇℃伅
*/
void generateHollowGlassInfo(String flowCardId, int totalLayer, int layer);
- Map<String, List<FlowCardGlassInfoDTO>> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query);
+ List<HollowAllFlowCardVO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query);
+
+ List<FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query);
Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
int queryLayerByFlowCardId(String flowCardId);
// List<LackDetailsDTO> queryLackByFlowCard(String flowCardId);
+
+ /**
+ * 鎸夌収鍘氬害鑾峰彇鐜荤拑闂撮殭
+ *
+ * @param thickness
+ * @return
+ */
+ Integer getGlassGapByThickness(Double thickness);
+
+ Boolean hollowBigStorageGlassDamage(DamageRequest request);
}
--
Gitblit v1.8.0