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/OrderDetlController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 321feeb..76f472a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -221,10 +221,13 @@
                 }
                 wrapper.in("source", docIds);
                 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);
+                        }
                     }
                 }
                 flag = true;
@@ -233,6 +236,7 @@
             }
             param.remove("orderType");
         }
+        wrapper.andNew();
         convertLike(param, wrapper);
         if (!Cools.isEmpty(orderByField)) {
             wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));

--
Gitblit v1.9.1