From e3d6bc6a8e660c8289f65947a7f8529ade25aa78 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 11 十月 2025 08:36:36 +0800
Subject: [PATCH] 1、 合并代码 解决冲突
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java
index bbfa62a..ea67d25 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java
@@ -1,6 +1,7 @@
package com.mes.hollow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.HollowGlassDetailsDTO;
import com.mes.hollow.entity.dto.LackDetailsDTO;
@@ -30,7 +31,16 @@
void clearDirtyFlowCardData(@Param("flowCardId") String flowCardId, @Param("layer") int layer);
+ /**
+ * 鎸夌収娴佺▼鍗¤幏鍙栦骇鍝佸悕绉�
+ *
+ * @param flowCardId
+ * @return
+ */
+ OrderDetailsDTO queryProductNameByFlowCardId(@Param("flowCardId") String flowCardId, @Param("productName") String productName, @Param("customerName") String customerName);
List<LackDetailsDTO> queryLackByFlowCard(@Param("flowCardId") String flowCardId);
+
+ List<GlassInfo> queryLackGlassByFlowCard(@Param("flowCardId") String flowCardId, @Param("orderSort") Integer orderSort, @Param("layer") Integer layer);
}
--
Gitblit v1.8.0