From 828641ce9d4178bbff9030ad19ce93d0267f185c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 17 九月 2025 08:36:42 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
index a8688c6..8804f39 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -3,31 +3,34 @@
<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderMapper">
<select id="getDetlForOrderId" resultType="com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto">
- SELECT
- odl.id AS detl_id,
- odl.order_id,
- odl.order_no,
- odl.anfme,
- odl.qty,
- odl.work_qty,
- odl.batch,
- odl.anfme - odl.qty - work_qty AS merge_num,
- mm.matnr,
- mm.maktx,
- mm.specs,
- mm.model,
- mm.barcode
- FROM
- man_order_detl odl
+ SELECT * FROM (
+ SELECT
+ odl.id AS detl_id,
+ odl.order_id,
+ odl.order_no,
+ odl.anfme,
+ odl.sorted,
+ odl.qty,
+ odl.work_qty,
+ odl.batch,
+ odl.anfme - odl.qty - work_qty AS merge_num,
+ mm.matnr,
+ mm.maktx,
+ mm.specs,
+ mm.model,
+ mm.barcode
+ FROM
+ man_order_detl odl
INNER JOIN man_mat mm ON odl.mat_id = mm.id
- WHERE odl.deleted = 0 AND odl.`status` = 1
- <if test="orderId != null">
- AND odl.order_id = #{orderId}
- </if>
- <if test="matId != null">
- AND odl.mat_id = #{matId}
- </if>
+ WHERE odl.deleted = 0 AND odl.`status` = 1
+ <if test="orderId != null">
+ AND odl.order_id = #{orderId}
+ </if>
+ <if test="matnr != null">
+ AND mm.matnr LIKE CONCAT('%', #{matnr}, '%')
+ </if>
+ ) t
ORDER BY
- work_qty ASC
+ `sorted` DESC
</select>
</mapper>
--
Gitblit v1.9.1