From 3760bb766253ea2b2291e00d7bc5147bdee9bb44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 16:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 61 +++++++++++++++++++++++++++---
1 files changed, 55 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 d3ab571..03b6a91 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -3,6 +3,16 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.OrderMapper">
+
+ <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}
+ </select>
+
<select id="selectMaxOrderId">
select
ifnull(SUBSTR(max(order_id) from 9),0)
@@ -17,13 +27,28 @@
<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
- from sd.order_detail as a group by a.order_id) od
+ (select a.order_id,
+ round(sum(a.perimeter),2) as aa,
+ sum(a.quantity) as b,
+ sum(a.compute_gross_area) as c,
+ sum(a.gross_amount) as 'detailAmount'
+ from sd.order_detail as a group by a.order_id
+ ) as od
on o.order_id = od.order_id
+ left join (select oom.order_id,
+ sum(oom.money) as 'money'
+ from order_other_money as oom
+ where
+ oom.order_id = #{orderId}
+ group by oom.order_id
+ ) as c
+ on c.order_id = o.order_id
set
+ o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
o.quantity = od.b,
o.area = od.c,
- o.perimeter= od.aa
+ o.perimeter= od.aa,
+ o.other_money = ifnull(c.money,0)
where
o.order_id = #{orderId}
@@ -31,9 +56,12 @@
<select id="getOrderList">
select
- *
+ *,
+ ifnull(sum(fgi.quantity_available),0) 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 != ''">
@@ -91,7 +119,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>
@@ -163,7 +191,16 @@
</select>
<update id="reviewOrderById">
- update `order` set order_review = #{status} where order_id = #{id}
+ update `order` set order_review = #{status},
+ verifier_id = #{userId},
+ verifier = #{userName}
+ where order_id = #{id}
+ </update>
+ <update id="reviewOrderByIds">
+ update `order` set order_review = #{status},process_review = #{status},
+ verifier_id = #{userId},
+ verifier = #{userName}
+ where order_id = #{id}
</update>
<update id="reviewProcessById">
@@ -174,4 +211,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