From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题,在制品汇总报表添加批次

---
 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 1e9753c..40aaeda 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -167,14 +167,14 @@
     </update>
 
     <select id="getDifferentSizeNumber">
-       select if(count(id)>1,1,0) from (select
+       select if(count(id)>0,1,0) from (select
           a.id,a.child_width,b.width
         from order_glass_detail as a
         left join order_detail as b
         on a.order_id = b.order_id and a.order_number = b.order_number
         where a.order_id = #{orderId}
           and a.order_number = #{orderNumber}
-          and a.child_width != b.width
+          and(a.child_width != b.width or a.child_height != b.height)
         ) as c
     </select>
 
@@ -202,4 +202,29 @@
 
     </select>
 
+    <select id="getMaxIdByGroup" >
+        select max(id) from sd.order_glass_detail as a
+        where a.order_id = #{orderId}
+          and a.order_number = #{orderNumber}
+          and a.`group` = #{group}
+
+    </select>
+
+
+    <select id="getMinTechnologyNumberByGroup" >
+        select min(technology_number) from sd.order_glass_detail as a
+        where a.order_id = #{orderId}
+          and a.order_number = #{orderNumber}
+          and a.`group` = #{group}
+
+    </select>
+
+    <select id="getMaxTechnologyNumberByGroup" >
+        select min(technology_number) from sd.order_glass_detail as a
+        where a.order_id = #{orderId}
+          and a.order_number = #{orderNumber}
+          and a.`group` = #{group}
+
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0