From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 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 74271f2..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
@@ -1,15 +1,34 @@
 package com.example.erp.mapper.sd;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.sd.OrderGlassDetail;
 import com.example.erp.entity.sd.OrderProcessDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
-public interface OrderGlassDetailMapper {
+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