From 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 21:30:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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..a459112 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -231,24 +231,28 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
+ param.remove("orderType");
+ convert(param, wrapper);
if (o != null) {
String[] split = o.toString().split(",");
if (split[0].equals("39")) {
//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 {
wrapper.in("source", split);
}
- param.remove("orderType");
}
- convert(param, wrapper);
+
// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
// List<Long> docIds = new ArrayList<>();
// for (DocType pakin : pakins) {
@@ -256,7 +260,8 @@
// 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);
}
@@ -318,8 +323,18 @@
docIds.add(pakin.getDocId());
}
}
- wrapper.like("matnr", "50", SqlLike.RIGHT);
wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode2();
+ if (!Cools.isEmpty(m)) {
+ 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);
+ }
+ }
+ }
+ //wrapper.like("matnr", "50", SqlLike.RIGHT);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -369,13 +384,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