From f1a496f4b53e3de34bdf82dab0faa40d2a29bc11 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 24 六月 2024 09:02:36 +0800
Subject: [PATCH] 其他金额设置筛选类型
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 770d133..3423e03 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,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
+ (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}
@@ -32,7 +57,7 @@
<select id="getOrderList">
select
*,
- sum(fgi.quantity_available) as goodsQuantity
+ ifnull(sum(fgi.quantity_available),0) as goodsQuantity
from
`order` as o
left join mm.finished_goods_inventory as fgi
@@ -166,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 = null,
+ verifier = null
+ where order_id = #{id}
</update>
<update id="reviewProcessById">
--
Gitblit v1.8.0