From 99b819fb7354c86ef4111a1b3465f63d6d263fd7 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 14 七月 2025 16:58:41 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OrderController.java | 19 ++++++++++++------- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 9 ++++++--- src/main/resources/application.yml | 2 +- 3 files changed, 19 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..7fcaa51 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 { @@ -369,13 +372,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); diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 321feeb..699134e 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; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f4d5610..0bef8f0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: #dev loc prod - active: prod + active: dev -- Gitblit v1.9.1