From 9272ffcd882f7fceef00dc01dc08b75a1e3acd4c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 十一月 2025 15:09:34 +0800
Subject: [PATCH] 1、 中空出片任务调度任务判定，占用单格的不配对的不执行调度，格子内全部为不配对的不调度 2、 移除无用包引用
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 929740e..93fd9c3 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,14 @@
package com.mes.hollow.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.glassinfo.entity.GlassInfo;
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.order.entity.OrderDetailsDTO;
+import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
@@ -22,21 +26,36 @@
*
* @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);
- Map<String, FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query);
+ List<FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query);
- Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
+ List<LackDetailsDTO> queryAllLackByFlowCard();
int queryLayerByFlowCardId(String flowCardId);
-// List<LackDetailsDTO> queryLackByFlowCard(String flowCardId);
+ Map<Integer,List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
+
+
+ /**
+ * 鎸夌収鍘氬害鑾峰彇鐜荤拑闂撮殭
+ *
+ * @param thickness
+ * @return
+ */
+ Integer getGlassGapByThickness(Double thickness);
+
+ Boolean hollowBigStorageGlassDamage(DamageRequest request);
+
+ OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName);
+
+ List<LackDetailsDTO> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
}
--
Gitblit v1.8.0