From a7748c3f762c5a68c368effdfef9c6f8e867059b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 二月 2025 09:27:03 +0800
Subject: [PATCH] 更改查询历史项目分组条件

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

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 7436f02..2d45565 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -10,7 +10,7 @@
         from
             sd.`order` as o
         where
-            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
+            o.quantity=#{order.quantity} and o.area=#{order.area} and trim(o.project)=trim(#{order.project}) and o.customer_id=#{order.customerId}
     </select>
 
     <select id="selectMaxOrderId">
@@ -39,6 +39,7 @@
             `order` as a
         where
             year(a.create_time)  = year(now())
+            and a.id>400
     </select>
 
     <select id="selectOrderIdMin">
@@ -47,6 +48,22 @@
 
     <select id="selectOrderIdIs">
         select count(*) from sd.`order` where SUBSTR(order_id,3,11)=#{substringInt}
+    </select>
+
+    <select id="selectOrderIdDay">
+        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},9,2)=01
+    </select>
+
+    <select id="selectOrderIdMonth">
+        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},7,4)=0001
+    </select>
+
+    <select id="selectOrderIdYear">
+        select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
+    </select>
+
+    <select id="selectOrderId">
+        select * from sd.`order` where order_id=#{orderId}
     </select>
 
     <update id="updateOrderId">
@@ -318,4 +335,15 @@
             o.order_id = #{orderId}
 
     </update>
+
+    <select id="selectDifferentSize">
+    select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
+    from sd.order_glass_detail ogd
+    where ogd.order_id = #{orderId}
+    group by ogd.order_number,ogd.child_height,child_width)
+    as a
+    group by a.order_number
+    having count(a.order_number) > 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0