From deef4c637b01c37c8a5bbe749ed93e6797fcfe19 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 19 七月 2024 14:54:23 +0800
Subject: [PATCH] 报工中空工序，多行显示问题
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 b1bfec0..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>
@@ -188,7 +198,6 @@
and o.delivery_address REGEXP #{order.deliveryAddress}
</if>
order by o.id desc
- limit #{offset},#{pageSize}
</select>
<update id="reviewOrderById">
@@ -210,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">
@@ -225,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