From 31dd633b16c89af8eef7c4dfbc99819db4e7fc3f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 10:09:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 18 +++++++++++++++---
1 files changed, 15 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 3423e03..0ed6c36 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -6,7 +6,7 @@
<select id="selectOrder">
select
- count(*)
+ *
from
sd.`order` as o
where
@@ -21,6 +21,16 @@
where
date(a.create_time) = curdate()
order by id desc,order_id desc limit 1
+ </select>
+
+ <select id="selectMaxOrderIdByMonth">
+ select
+ ifnull(SUBSTR(order_id from 7),0)
+ from
+ `order` as a
+ where
+ date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
+ order by id desc limit 1
</select>
@@ -48,7 +58,8 @@
o.quantity = od.b,
o.area = od.c,
o.perimeter= od.aa,
- o.other_money = ifnull(c.money,0)
+ o.other_money = ifnull(c.money,0),
+ o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and edging_type is not null)
where
o.order_id = #{orderId}
@@ -193,7 +204,8 @@
<update id="reviewOrderById">
update `order` set order_review = #{status},
verifier_id = #{userId},
- verifier = #{userName}
+ verifier = #{userName},
+ update_time=now()
where order_id = #{id}
</update>
<update id="reviewOrderByIds">
--
Gitblit v1.8.0