From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java
index eb347b7..4385cd6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java
@@ -7,10 +7,28 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface OrderGlassDetailMapper  extends BaseMapper<OrderGlassDetail> {
     boolean insertOrderGlassDetail(@Param("orderId") String orderId);
 
     List<OrderGlassDetail> selectOrderGlassDetail(@Param("orderId") String orderId);
+
+    List<OrderGlassDetail> selectOrderGlassDetailByOrderId(@Param("orderId") String orderId);
+
+    void updateSizeAndProcess(@Param("orderGlassDetails")List<OrderGlassDetail> orderGlassDetails);
+
+    Integer getDifferentSizeNumber(String orderId, Integer orderNumber);
+
+    List<Map<String,Object>> getOrderGlassDetailByProductId(String orderId, String glassChild,Long productId);
+
+    List<OrderGlassDetail> getOrderGlassDetailByProductIdGlassChild(String orderId, Integer orderNumber);
+
+    Integer getMinIdByGroup(String orderId, String orderNumber, String group);
+    Integer getMaxIdByGroup(String orderId, String orderNumber, String group);
+
+    Integer getMinTechnologyNumberByGroup(String orderId, String orderNumber, String group);
+
+    Integer getMaxTechnologyNumberByGroup(String orderId, String orderNumber, String group);
 }

--
Gitblit v1.8.0