From 82e3d32282cd6bc07e36564306fe5c35fdfb89da Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 23 九月 2024 17:16:32 +0800
Subject: [PATCH] bug修改，初步完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index d95c320..45fd7af 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -150,12 +150,6 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
- Object barcode = null;
- if (!Cools.isEmpty(param.get("barcode"))) {
- barcode = param.get("barcode");
- }
- param.remove("zpallet");
- param.remove("barcode");
if (!Cools.isEmpty(param.get("decrees"))) {
ArrayList<String> mats = new ArrayList<>();
@@ -167,7 +161,6 @@
mats.add(mat.getMatnr());
}
}
-
wrapper.in("matnr", mats);
param.remove("decrees");
}
@@ -183,18 +176,16 @@
wrapper.le("appe_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("locNo"))) {
- wrapper.eq("loc_no", param.get("locNo"));
+ wrapper.like("loc_no", param.get("locNo"));
}
- if (!Cools.isEmpty(barcode)) {
- wrapper.eq("zpallet", barcode);
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
}
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}
-
-
param.remove("locNo");
param.remove("owner");
--
Gitblit v1.9.1