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/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 3 ++-
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 7 +++++--
src/main/resources/mapper/payment/OrderMapper.xml | 12 ++++++------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 54010dd..8194b14 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -716,7 +716,8 @@
}
if(!Constants.ORDER_STATUS_BACKEND.COLLECTION.name().equals(o.getStatusBackend())
- && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())){
+ && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())
+ ){
throw new ValidationException("订单状态异常，不可提交质检记录");
}
diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index 2a91ac6..72c4014 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -6,7 +6,9 @@
SELECT q.*, o.warehouse_name, o.warehouse_location_code, o.payment_time
FROM t_delivery_order q
join t_order o on q.order_id = o.id
- WHERE q.deleted = 0 and o.deleted = 0
+ left join t_warehouse w on o.warehouse_id=w.id
+ left join t_warehouse_location wl on o.warehouse_location_id=wl.id
+ WHERE q.deleted = 0 and o.deleted = 0 and w.deleted=0 and wl.deleted=0
and q.supplier_id = #{supplierId}
<if test="condition.orderNo != null and condition.orderNo != ''">
AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
@@ -29,7 +31,8 @@
<if test="condition.endDate != null">
AND o.payment_time < #{condition.endDate}
</if>
- ORDER BY o.payment_time
+-- ORDER BY o.payment_time
+ order by w.seq,wl.seq asc
</select>
<select id="selectDoStationList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderStationListDTO">
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