From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index c1a7f88..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,7 +119,7 @@
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) {
@@ -145,13 +145,23 @@
// .eq("matnr", record.getMatnr())
// .in("source", docIds));
// } else {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("three_code", record.getThreeCode())
.eq("matnr", record.getMatnr())
.in("source", docIds)
- .orderBy("qty", false)
+ .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());
--
Gitblit v1.9.1