From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/resources/mapper/OrderMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 6aed376..e359a06 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -111,7 +111,27 @@
and mo.settle = 1
</select>
<select id="selectOrderNosByOrderNoLike" resultType="java.lang.String">
- select order_no from man_order where settle = 4 and order_no like '%' + #{orderNo} + '%'
+ select order_no from man_order where settle = 4 and order_no like '%' + #{orderNo} + '%' and doc_type in(21,23)
+ </select>
+ <select id="getUnfulfilledOrders" resultType="com.zy.asrs.entity.OrderStatisticsDto">
+ select
+ mo.order_no orderNo,
+ count(mo.order_no) sum,
+ count(case when md.work_qty = 0 then 1 end) toShipQuantity,
+ count(case when md.work_qty != 0 and md.qty = 0 then 1 end) workQuantity,
+ count(case when md.anfme = md.qty then 1 end) completedQuantity
+ from
+ man_order mo
+ LEFT JOIN man_order_detl md on
+ mo.id = md.order_id
+ where
+ mo.doc_type = 21
+ and mo.settle in(1, 2)
+ <if test="orderNo != ''">
+ and mo.order_no = #{orderNo}
+ </if>
+ GROUP BY
+ mo.order_no
</select>
</mapper>
--
Gitblit v1.9.1