From 5dff87c18f48e0a14440d1225924d35f8de7b00e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 12:31:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index e0134e4..4ce625f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -237,10 +237,13 @@
//wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
wrapper.in("source", split);
List<String> m = configService.getMatCode();
- wrapper.andNew();
if (!Cools.isEmpty(m)) {
- for (String s : m) {
- wrapper.like("matnr", s, SqlLike.RIGHT);
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().like("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().like("matnr", m.get(i), SqlLike.RIGHT);
+ }
}
}
} else {
@@ -248,6 +251,7 @@
}
param.remove("orderType");
}
+ wrapper.andNew();
convert(param, wrapper);
// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
// List<Long> docIds = new ArrayList<>();
@@ -256,7 +260,9 @@
// docIds.add(pakin.getDocId());
// }
// }
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+
+ return R.ok(orderDetlPage);
}
@@ -369,13 +375,15 @@
wrapper.in("source", docIds);
List<String> m = configService.getMatCode();
- wrapper.andNew();
if (!Cools.isEmpty(m)) {
- for (String s : m) {
- wrapper.notLike("matnr", s, SqlLike.RIGHT);
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ }
}
}
-
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
--
Gitblit v1.9.1