From 9d8f1ecf0dcdf7de5fe9db39a125540640d83a25 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 七月 2024 15:35:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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..a57e1d9 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -6,11 +6,11 @@
<select id="selectOrder">
select
- count(*)
+ *
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} and o.money=#{order.money}
+ o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
</select>
<select id="selectMaxOrderId">
@@ -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}
@@ -187,13 +198,13 @@
and o.delivery_address REGEXP #{order.deliveryAddress}
</if>
order by o.id desc
- limit #{offset},#{pageSize}
</select>
<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">
@@ -208,7 +219,7 @@
</update>
<update id="updateMoney">
- update `order` set money = #{order.money} where order_id = #{order.orderId}
+ update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
</update>
<update id="cancelOrder">
@@ -223,4 +234,11 @@
where order_id = #{order.orderId}
</update>
+ <update id="updateOrderPrintNumber">
+ update sd.`order` o
+ set o.printing_number=o.printing_number+1
+ where
+ o.order_id = #{orderId}
+
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0