From 66883126faa033315062d802c21067554df0a489 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 09 十月 2024 09:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index 4718c8e..ddce902 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -72,13 +72,21 @@
treeUtils.getTagIdList(Long.parseLong(tagId.toString()), nodes);
wrapper.in("tag_id", nodes);
if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.eq("matnr", param.get("matnr"));
+ wrapper.like("matnr", param.get("matnr"));
}
if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.eq("maktx", param.get("maktx"));
+ wrapper.like("maktx", param.get("maktx"));
}
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ wrapper.like("decrees", param.get("decrees"));
+ }
+// if (!Cools.isEmpty(param.get("owner$"))) {
+// wrapper.eq("owner", param.get("owner$"));
+// }
param.remove("matnr");
param.remove("maktx");
+ param.remove("decrees");
+// param.remove("owner$");
allLike(Mat.class, param.keySet(), wrapper, condition);
return R.ok(matService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1