From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 31a328f..a5ae3ad 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -199,7 +199,7 @@
) as acc
order by
<if test="orderBy == null ">
- id desc
+ order_id desc
</if>
<if test="orderBy == 'desc'">
${field} desc
@@ -217,7 +217,7 @@
sum(o.quantity) as quantity,
sum(o.area) as area,
sum(o.money) as money,
- fgi.goodsQuantity,
+ ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
ROUND(sum(perimeter),2) as perimeter,
#{pageSize} as pageSize
from
@@ -330,6 +330,13 @@
where order_id = #{id}
</update>
+ <update id="backReviewOrderById">
+ update `order` set order_review = 0,
+ verifier_id = null,
+ verifier = null
+ where order_id = #{id}
+ </update>
+
<update id="reviewProcessById">
update `order` set process_review = #{status} where order_id = #{id}
</update>
@@ -368,4 +375,8 @@
having count(a.order_number) > 1
</select>
+ <select id="searchOrderWarehousing">
+ select warehousing from `order`
+ where order_id = #{orderId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0