From 6ef02b9d71b3f6af9bec3355c1f06f3782f1a142 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 六月 2024 15:46:34 +0800
Subject: [PATCH] 加工单打印和导出功能
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 10 +++++++---
1 files changed, 7 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 6af7965..b02c622 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -37,7 +37,8 @@
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}
@@ -46,7 +47,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
@@ -180,7 +181,10 @@
</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="reviewProcessById">
--
Gitblit v1.8.0