From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 3dcd623..543e175 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -33,12 +33,13 @@
     </select>
 
     <select id="selectMaxOrderIdByYear">
-        select
-            ifnull(SUBSTR(max(order_id) from 5),0)
+       select ifnull((select
+            SUBSTR(order_id from 5)
         from
             `order` as a
         where
-            year(a.create_time)  = year(NOW())
+            year(a.create_time)  = year(now())
+        order by  id desc limit 1),0) temp
     </select>
 
     <update id="updateOrderParameter">

--
Gitblit v1.8.0