From da12030e9d76e0a1dacea3c3bd612d646f90066e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 16 十二月 2024 19:30:19 +0800
Subject: [PATCH] 1.异常未质检订单修改 2.仓位按照顺序排序
---
src/main/resources/mapper/payment/OrderMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 4e4a2ab..2d3a5e8 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -68,7 +68,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -174,7 +174,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -410,7 +410,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -510,7 +510,7 @@
and oi.status in ('abnormal','reduce','lack','back')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
union
@@ -529,7 +529,7 @@
where oi.order_id = q.id
and oi.status in ('abnormal','reduce','lack','back')
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
)
</select>
@@ -586,7 +586,7 @@
<!-- and (oi.status = 'reduce' or oi.status = 'abnormal')-->
<!-- )-->
<!-- and q.transfer_id is null-->
-<!-- and q.status in ('COLLECTION', 'SEND')-->
+<!-- and q.status in ('COLLECTION', 'SEND','RECEIVE')-->
<!-- </if>-->
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
--
Gitblit v1.9.3