From 7bb188f8b47524eac7dde3626f3d9d8e959ae753 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 21:06:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index 08f5a62..6432382 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -84,7 +84,7 @@
@RequestMapping(value = "/locDetl/list/auth/v2")
@ManagerAuth
public R listV2(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(defaultValue = "100") Integer limit,
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam(required = false) String condition,
@@ -119,11 +119,12 @@
wrapper.and()
.where("loc_no like '" + row + "%'");
}
- Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, 500), wrapper);
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.get("loc_no")));
String orderNo = null;
if (agvWrkMast != null) {
- List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
+ //List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
if (!agvWrkDetls.isEmpty()) {
orderNo = agvWrkDetls.get(0).getOrderNo();
}
@@ -136,19 +137,32 @@
}
}
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 {
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
+ .eq("three_code", record.getThreeCode())
+ .eq("matnr", record.getMatnr())
+ .in("source", docIds)
+ .orderBy("qty", true)
+ .orderBy("anfme", false)
+ .orderBy("create_time", true));
+ OrderDetl orderDetl = null;
+ if (!orderDetls.isEmpty()) {
+ for (OrderDetl o : orderDetls) {
+ if (o.getAnfme() - o.getQty() > 0) {
+ orderDetl = o;
+ break;
+ }
+ }
}
+
+ // }
// if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
// record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
// } else {
@@ -156,6 +170,9 @@
// }
if (Cools.isEmpty(orderDetl)) {
record.setStock(0D);
+// if (!Cools.isEmpty(orderNo)) {
+// record.setOrderNo(orderNo);
+// }
} else {
record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
record.setOrderNo(orderDetl.getOrderNo());
--
Gitblit v1.9.1