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 | 19 ++++++++++++++-----
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 10 ++++++++++
src/main/java/com/zy/system/mapper/ConfigMapper.java | 3 +++
src/main/java/com/zy/system/service/ConfigService.java | 3 +++
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 5 ++---
5 files changed, 32 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 4ce625f..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,10 +251,8 @@
} else {
wrapper.in("source", split);
}
- param.remove("orderType");
}
- wrapper.andNew();
- convert(param, wrapper);
+
// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
// List<Long> docIds = new ArrayList<>();
// for (DocType pakin : pakins) {
@@ -261,7 +261,6 @@
// }
// }
Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
-
return R.ok(orderDetlPage);
}
@@ -324,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));
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 76f472a..49ba281 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -207,7 +207,9 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
+ param.remove("orderType");
boolean flag = false;
+ convertLike(param, wrapper);
if (o != null) {
String[] split = o.toString().split(",");
//-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
@@ -234,10 +236,7 @@
} else {
wrapper.in("source", split);
}
- param.remove("orderType");
}
- wrapper.andNew();
- convertLike(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index f4834d9..3627798 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -13,4 +13,7 @@
@Select("select top 1 * from sys_config where code='MAT_CODE_31'")
Config selectByCode();
+
+ @Select("select top 1 * from sys_config where code='MAT_CODE_10'")
+ Config selectByCode2();
}
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index d57a9cf..8d1d31b 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -7,4 +7,7 @@
public interface ConfigService extends IService<Config> {
List<String> getMatCode();
+
+ List<String> getMatCode2();
+
}
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 00808ba..29170ea 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -21,4 +21,14 @@
String[] split = config.getValue().split(",");
return Arrays.asList(split);
}
+
+ @Override
+ public List<String> getMatCode2() {
+ Config config = baseMapper.selectByCode2();
+ if (Cools.isEmpty(config)) {
+ return null;
+ }
+ String[] split = config.getValue().split(",");
+ return Arrays.asList(split);
+ }
}
--
Gitblit v1.9.1