From efd08b1b4e4cbf8007096bee5d7912979e3e427a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 10 二月 2025 12:44:12 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index d2adaec..c1a7f88 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -137,19 +137,22 @@
}
}
for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
- OrderDetl orderDetl;
- if (!Cools.isEmpty(orderNo)) {
- orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", orderNo)
- .eq("three_code", record.getThreeCode())
- .eq("matnr", record.getMatnr())
- .in("source", docIds));
- } else {
- orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("three_code", record.getThreeCode())
- .eq("matnr", record.getMatnr())
- .in("source", docIds));
- }
+ //OrderDetl orderDetl;
+// if (!Cools.isEmpty(orderNo)) {
+// orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+// .eq("order_no", orderNo)
+// .eq("three_code", record.getThreeCode())
+// .eq("matnr", record.getMatnr())
+// .in("source", docIds));
+// } else {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+ .eq("three_code", record.getThreeCode())
+ .eq("matnr", record.getMatnr())
+ .in("source", docIds)
+ .orderBy("qty", false)
+ .orderBy("anfme", false)
+ .orderBy("create_time", true));
+ // }
// if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
// record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
// } else {
@@ -157,9 +160,9 @@
// }
if (Cools.isEmpty(orderDetl)) {
record.setStock(0D);
- if (!Cools.isEmpty(orderNo)) {
- record.setOrderNo(orderNo);
- }
+// if (!Cools.isEmpty(orderNo)) {
+// record.setOrderNo(orderNo);
+// }
} else {
record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
record.setOrderNo(orderDetl.getOrderNo());
--
Gitblit v1.9.1