From 3bbf78db5e01bd8d080e9e4965a532326bc162ad Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 26 六月 2024 18:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 03b6a91..7d57445 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -48,7 +48,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}
@@ -198,8 +199,8 @@
</update>
<update id="reviewOrderByIds">
update `order` set order_review = #{status},process_review = #{status},
- verifier_id = #{userId},
- verifier = #{userName}
+ verifier_id = null,
+ verifier = null
where order_id = #{id}
</update>
--
Gitblit v1.8.0