From 42b021b392b9752c4520425d245213ed262c9059 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 01 三月 2025 23:04:50 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 50a5d9c..31bae3d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -231,7 +231,7 @@
if (o != null) {
String[] split = o.toString().split(",");
if (split[0].equals("39")) {
- wrapper.in("source", split).andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT);
+ wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
} else {
wrapper.in("source", split);
}
@@ -245,7 +245,6 @@
// docIds.add(pakin.getDocId());
// }
// }
-
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -393,7 +392,7 @@
// wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
- Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
+ Double sumAnfme = agvLocDetlService.getSumAnfmeDb2(record.getMatnr(), record.getThreeCode(), 1);
record.setStock(sumAnfme == null ? 0 : sumAnfme);
}
return R.ok(page);
--
Gitblit v1.9.1