From f4712cb12cc653b2aff19379fd7756fcfb478b90 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:55:36 +0800
Subject: [PATCH] 1、冲突代码合并
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 c1f2395..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,11 +1,13 @@
package com.mes.hollow.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.common.config.ConstSysConfig;
+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;
@@ -24,7 +26,7 @@
*
* @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);
/**
* 鐢熸垚涓┖鐜荤拑淇℃伅
@@ -35,18 +37,25 @@
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