From 13bdad370f0b35b68f79a75f8183a23135e45225 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:03:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 7fcaa51..a459112 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -231,6 +231,8 @@
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")) {
@@ -249,9 +251,8 @@
} 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) {
@@ -259,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);
}
@@ -321,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));
}
--
Gitblit v1.9.1