From 0daaeb174e75859e3bf969d4e9185fc14fda977d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:18:54 +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 e730c2a..770d133 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -5,18 +5,19 @@
<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>
<update id="updateOrderParameter">
update `order` o
left join
- (select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
+ (select a.order_id,round(sum(a.perimeter),2) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
from sd.order_detail as a group by a.order_id) od
on o.order_id = od.order_id
set
@@ -30,9 +31,12 @@
<select id="getOrderList">
select
- *
+ *,
+ sum(fgi.quantity_available) as goodsQuantity
from
`order` as o
+ left join mm.finished_goods_inventory as fgi
+ on o.order_id = fgi.order_id
where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
<if test="orderType!= null and orderType != ''">
@@ -90,7 +94,7 @@
<if test="order.deliveryAddress != null and order.deliveryAddress != ''">
and o.delivery_address REGEXP #{order.deliveryAddress}
</if>
-
+ group by o.id
order by o.id desc
limit #{offset},#{pageSize}
</select>
@@ -173,4 +177,16 @@
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