From b8dbadb0b1bc4e5f3d6379fddf96fe11053f2de4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 16:54:27 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 8 ++--
zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml | 51 +++++++++++++------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 3 +
3 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index d1449e0..0eaf8d2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -145,6 +145,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty("浼樺厛绾�")
+ private Integer sorted;
+
/**
* 鍟嗗搧搴撳瓨绱㈠紩
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
index dcbebd7..6bedb2d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
@@ -111,13 +111,13 @@
}
if (orderDetl.getWaitQty().compareTo(orderDetl.getAnfme()) >= 0) {
- waitPakin.setSort(0);
+ orderDetl.setSorted(0);
} else if (orderDetl.getWaitQty().compareTo(0.0) > 0) {
- waitPakin.setSort(55);
+ orderDetl.setSorted(55);
} else {
- waitPakin.setSort(49);
+ orderDetl.setSorted(49);
}
- waitPakinService.updateById(waitPakin);
+ orderDetlService.updateById(orderDetl);
//鏇存柊璁㈠崟鐘舵��
if (order.getOrderSettle().equals(OrderSettleType.INIT.val())) {
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 0eaa250..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="matnr != null">
- AND mm.matnr LIKE CONCAT('%', #{matnr}, '%')
- </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