From 723edfdd07208ec27409d1cffb70b9a4eac69446 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:13:22 +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 |   19 ++++++++++++++++++-
 1 files changed, 18 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 0b4cb11..b294546 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -5,11 +5,12 @@
 <mapper namespace="com.example.erp.mapper.sd.OrderMapper">
     <select id="selectMaxOrderId">
         select
-            COUNT(a.order_id)
+           ifnull(SUBSTR(max(order_id) from 9),0)
         from
             `order` as a
         where
             date(a.create_time) = curdate()
+        order by id desc,order_id	desc limit  1
     </select>
     
 
@@ -169,4 +170,20 @@
         update `order` set process_review = #{status} where order_id = #{id}
     </update>
 
+    <update id="updateMoney">
+        update `order` set money = #{order.money} where order_id = #{order.orderId}
+    </update>
+
+    <update id="cancelOrder">
+        update `order` as a set
+            a.create_order = - a.create_order,
+            a.process_review = - a.process_review,
+            a.order_review = - a.order_review,
+            a.production_order = - a.production_order,
+            a.processing_card =  - a.processing_card,
+            a.warehousing = - a.warehousing,
+            a.delivery = - a.delivery
+        where order_id = #{order.orderId}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0